From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Sun, 20 Apr 2025 15:27:18 +0000 (-0400)
Subject: bcachefs: __bch2_fs_read_write() no longer depends on io_ref
X-Git-Tag: v6.16-rc1~211^2~144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e14e06e91dadcd1c65f08ba5a02716d3e855fc74;p=thirdparty%2Fkernel%2Flinux.git

bcachefs: __bch2_fs_read_write() no longer depends on io_ref

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/super.c b/fs/bcachefs/super.c
index 834c68a273b48..cdcfed4dd283e 100644
--- a/fs/bcachefs/super.c
+++ b/fs/bcachefs/super.c
@@ -471,10 +471,14 @@ static int __bch2_fs_read_write(struct bch_fs *c, bool early)
 
 	clear_bit(BCH_FS_clean_shutdown, &c->flags);
 
-	__for_each_online_member(c, ca, BIT(BCH_MEMBER_STATE_rw), READ) {
-		bch2_dev_allocator_add(c, ca);
-		percpu_ref_reinit(&ca->io_ref[WRITE]);
-	}
+	rcu_read_lock();
+	for_each_online_member_rcu(c, ca)
+		if (ca->mi.state == BCH_MEMBER_STATE_rw) {
+			bch2_dev_allocator_add(c, ca);
+			percpu_ref_reinit(&ca->io_ref[WRITE]);
+		}
+	rcu_read_unlock();
+
 	bch2_recalc_capacity(c);
 
 	/*
@@ -1149,8 +1153,11 @@ int bch2_fs_start(struct bch_fs *c)
 	 */
 	mutex_unlock(&c->sb_lock);
 
-	for_each_rw_member(c, ca)
-		bch2_dev_allocator_add(c, ca);
+	rcu_read_lock();
+	for_each_online_member_rcu(c, ca)
+		if (ca->mi.state == BCH_MEMBER_STATE_rw)
+			bch2_dev_allocator_add(c, ca);
+	rcu_read_unlock();
 	bch2_recalc_capacity(c);
 	up_write(&c->state_lock);