summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2022-04-22 18:49:57 -0400
committerKent Overstreet <kent.overstreet@gmail.com>2022-04-22 18:51:41 -0400
commit152a4dfe516013380a9ace5c3dce60b0c06b2955 (patch)
tree29e061467510683b900bb5b479604ed685a93055
parent4ab859261bda6a4d5b5ebc60782a34af333f14c4 (diff)
fixup! bcachefs: Shutdown path improvements
-rw-r--r--fs/bcachefs/super.c3
1 files changed, 2 insertions, 1 deletions
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);