From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Sat, 28 Mar 2020 22:26:01 +0000 (-0400)
Subject: bcachefs: Read journal when keep_journal on
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5a655f06c94f541fa9223a9b7ef2ab8a909f1fea;p=linux.git

bcachefs: Read journal when keep_journal on

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

diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c
index 0c8444b5278f9..c0e6cfa36c89a 100644
--- a/fs/bcachefs/recovery.c
+++ b/fs/bcachefs/recovery.c
@@ -820,7 +820,7 @@ int bch2_fs_recovery(struct bch_fs *c)
 		set_bit(BCH_FS_REBUILD_REPLICAS, &c->flags);
 	}
 
-	if (!c->sb.clean || c->opts.fsck) {
+	if (!c->sb.clean || c->opts.fsck || c->opts.keep_journal) {
 		struct jset *j;
 
 		ret = bch2_journal_read(c, &c->journal_entries);