From f28620c108a9476c7b4b25b8e36b94b6b2b29295 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sat, 1 Jan 2022 20:45:30 -0500 Subject: [PATCH] bcachefs: Tweak journal reclaim order Signed-off-by: Kent Overstreet --- fs/bcachefs/recovery.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c index 39b5b97704b70..219351654564a 100644 --- 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) -- 2.30.2