From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Fri, 30 May 2025 00:06:01 +0000 (-0400)
Subject: bcachefs: Journal keys are retained until shutdown, or journal replay finishes
X-Git-Tag: v6.16-rc1~48^2~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a1accd3a57d4bfb6daeee2262b1b24b57ec2382;p=thirdparty%2Fkernel%2Flinux.git

bcachefs: Journal keys are retained until shutdown, or journal replay finishes

If we don't finish journal replay we need to keep journal keys around
until the filesystem shuts down - otherwise e.g. -o norecovery, various
tools (dump, list) break, and eventually we'll be doing journal replay
in the background.

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

diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c
index 4fca575755657..4b51105bdb2e1 100644
--- a/fs/bcachefs/recovery.c
+++ b/fs/bcachefs/recovery.c
@@ -1093,10 +1093,6 @@ use_clean:
 out:
 	bch2_flush_fsck_errs(c);
 
-	if (!c->opts.retain_recovery_info) {
-		bch2_journal_keys_put_initial(c);
-		bch2_find_btree_nodes_exit(&c->found_btree_nodes);
-	}
 	if (!IS_ERR(clean))
 		kfree(clean);