From 152a4dfe516013380a9ace5c3dce60b0c06b2955 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Fri, 22 Apr 2022 18:49:57 -0400 Subject: fixup! bcachefs: Shutdown path improvements --- fs/bcachefs/super.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/bcachefs/super.c b/fs/bcachefs/super.c index d1e08abb86f7..bdac2b727233 100644 --- a/fs/bcachefs/super.c +++ b/fs/bcachefs/super.c @@ -215,7 +215,8 @@ static void __bch2_fs_read_only(struct bch_fs *c) bch_verbose(c, "flushing journal and stopping allocators complete"); - if (test_bit(JOURNAL_REPLAY_DONE, &c->journal.flags)) + if (test_bit(JOURNAL_REPLAY_DONE, &c->journal.flags) && + !test_bit(BCH_FS_EMERGENCY_RO, &c->flags)) set_bit(BCH_FS_CLEAN_SHUTDOWN, &c->flags); bch2_fs_journal_stop(&c->journal); -- cgit v1.2.3