From: Kent Overstreet Date: Sun, 27 Feb 2022 01:25:15 +0000 (-0500) Subject: bcachefs: Kill BCH_FS_HOLD_BTREE_WRITES X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=55334d78974fa44735bb59229eedde0bcc300ed6;p=linux.git bcachefs: Kill BCH_FS_HOLD_BTREE_WRITES This was just dead code. Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/bcachefs.h b/fs/bcachefs/bcachefs.h index 378061712c768..e5bc09870c577 100644 --- a/fs/bcachefs/bcachefs.h +++ b/fs/bcachefs/bcachefs.h @@ -534,7 +534,6 @@ enum { BCH_FS_NEED_ANOTHER_GC, BCH_FS_DELETED_NODES, BCH_FS_REBUILD_REPLICAS, - BCH_FS_HOLD_BTREE_WRITES, }; struct btree_debug { diff --git a/fs/bcachefs/btree_cache.c b/fs/bcachefs/btree_cache.c index dbf3b084478f6..a8d5c06541d03 100644 --- a/fs/bcachefs/btree_cache.c +++ b/fs/bcachefs/btree_cache.c @@ -223,8 +223,7 @@ wait_on_io: goto out_unlock; if (btree_node_dirty(b)) { - if (!flush || - test_bit(BCH_FS_HOLD_BTREE_WRITES, &c->flags)) + if (!flush) goto out_unlock; /* * Using the underscore version because we don't want to compact diff --git a/fs/bcachefs/btree_io.c b/fs/bcachefs/btree_io.c index 1dc21b5948eaf..06704299640d1 100644 --- a/fs/bcachefs/btree_io.c +++ b/fs/bcachefs/btree_io.c @@ -1772,9 +1772,6 @@ void __bch2_btree_node_write(struct bch_fs *c, struct btree *b, bool already_sta if (already_started) goto do_write; - if (test_bit(BCH_FS_HOLD_BTREE_WRITES, &c->flags)) - return; - /* * We may only have a read lock on the btree node - the dirty bit is our * "lock" against racing with other threads that may be trying to start diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c index 49e475c15451d..6b793c9e95f43 100644 --- a/fs/bcachefs/btree_update_interior.c +++ b/fs/bcachefs/btree_update_interior.c @@ -1104,8 +1104,7 @@ static void bch2_btree_set_root(struct btree_update *as, struct btree *old; trace_btree_set_root(c, b); - BUG_ON(!b->written && - !test_bit(BCH_FS_HOLD_BTREE_WRITES, &c->flags)); + BUG_ON(!b->written); old = btree_node_root(c, b);