summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2020-10-25 01:08:28 -0400
committerKent Overstreet <kent.overstreet@gmail.com>2020-10-25 01:08:28 -0400
commit0de3a85e038c4045c2d67ab91298afe85d946ef5 (patch)
tree796fbf0617fdd86073d89384aa810cfbb2a3e0ce
parent8436db7aac9ced2118bf19b8f1bf3682f479d17e (diff)
bcachefs: Always write a journal entry when stopping journal
This is to fix a (harmless) bug where the read clock hand in the superblock doesn't match the journal. Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
-rw-r--r--fs/bcachefs/journal.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/bcachefs/journal.c b/fs/bcachefs/journal.c
index b8b719902c63..c2cafd3892a4 100644
--- a/fs/bcachefs/journal.c
+++ b/fs/bcachefs/journal.c
@@ -980,9 +980,11 @@ void bch2_fs_journal_stop(struct journal *j)
wait_event(j->wait, journal_entry_close(j));
- /* do we need to write another journal entry? */
- if (test_bit(JOURNAL_NOT_EMPTY, &j->flags))
- bch2_journal_meta(j);
+ /*
+ * Always write a new journal entry, to make sure the clock hands are up
+ * to date (and match the superblock)
+ */
+ bch2_journal_meta(j);
journal_quiesce(j);