bcachefs: Fix locking in allocator thread

gc lock must be held while invalidating buckets - fixes
"1f7a95698e bcachefs: Invalidate buckets when writing to alloc btree"

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

diff --git a/fs/bcachefs/alloc.c b/fs/bcachefs/alloc.c
index ea1dc52e5ff6ea780ee5a610da3c13db6c865dca..192ab655ca238e992498e3956bb77cd80b1f2bec 100644 (file)
--- a/fs/bcachefs/alloc.c
+++ b/fs/bcachefs/alloc.c
@@ -964,16 +964,21 @@ static int bch2_allocator_thread(void *arg)
                if (ret)
                        goto stop;
 
+               down_read(&c->gc_lock);
+
                ret = bch2_invalidate_buckets(c, ca);
-               if (ret)
+               if (ret) {
+                       up_read(&c->gc_lock);
                        goto stop;
+               }
 
-               if (!fifo_empty(&ca->free_inc))
+               if (!fifo_empty(&ca->free_inc)) {
+                       up_read(&c->gc_lock);
                        continue;
+               }
 
                pr_debug("free_inc now empty");
 
-               down_read(&c->gc_lock);
                do {
                        if (test_bit(BCH_FS_GC_FAILURE, &c->flags)) {
                                up_read(&c->gc_lock);