bcachefs: Tweak journal reclaim order

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>

diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c
index 39b5b97704b7033368fec24b910471a1b6a76663..219351654564adcf10089f4c2422f9faf4123790 100644 (file)
--- a/fs/bcachefs/recovery.c
+++ b/fs/bcachefs/recovery.c
@@ -116,12 +116,19 @@ int bch2_journal_key_insert_take(struct bch_fs *c, enum btree_id id,
                .btree_id       = id,
                .level          = level,
                .k              = k,
-               .allocated      = true
+               .allocated      = true,
+               /*
+                * Ensure these keys are done last by journal replay, to unblock
+                * journal reclaim:
+                */
+               .journal_seq    = U32_MAX,
        };
        struct journal_keys *keys = &c->journal_keys;
        struct journal_iter *iter;
        unsigned idx = journal_key_search(keys, id, level, k->k.p);
 
+       BUG_ON(test_bit(BCH_FS_RW, &c->flags));
+
        if (idx < keys->nr &&
            journal_key_cmp(&n, &keys->d[idx]) == 0) {
                if (keys->d[idx].allocated)