bcachefs: Fix order of gc_done passes
authorKent Overstreet <kent.overstreet@linux.dev>
Sun, 10 Mar 2024 20:29:06 +0000 (16:29 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Thu, 14 Mar 2024 01:22:26 +0000 (21:22 -0400)
gc_stripes_done() and gc_reflink_done() may do alloc btree updates (i.e.
when deleting an indirect extent) - we need bucket gens to be fixed by
then.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/btree_gc.c

index 0e1ef8bef997835b521f069f8ecabc12a63efdcf..550d71bcedc4b78e738cf61af043ef2786a44d06 100644 (file)
@@ -1818,10 +1818,10 @@ out:
        if (!ret) {
                bch2_journal_block(&c->journal);
 
-               ret   = bch2_gc_stripes_done(c, metadata_only) ?:
-                       bch2_gc_reflink_done(c, metadata_only) ?:
-                       bch2_gc_alloc_done(c, metadata_only) ?:
-                       bch2_gc_done(c, initial, metadata_only);
+               ret   = bch2_gc_alloc_done(c, metadata_only) ?:
+                       bch2_gc_done(c, initial, metadata_only) ?:
+                       bch2_gc_stripes_done(c, metadata_only) ?:
+                       bch2_gc_reflink_done(c, metadata_only);
 
                bch2_journal_unblock(&c->journal);
        }