From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Sun, 2 Jan 2022 01:45:30 +0000 (-0500)
Subject: bcachefs: Tweak journal reclaim order
X-Git-Tag: v6.7-rc1~201^2~1203
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f28620c108a9476c7b4b25b8e36b94b6b2b29295;p=thirdparty%2Fkernel%2Flinux.git

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 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)