From 8be901d5d4a266e6838cdb6781084a02d2b37ace Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sun, 25 Oct 2020 01:08:28 -0400 Subject: [PATCH] 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 Signed-off-by: Kent Overstreet --- fs/bcachefs/journal.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fs/bcachefs/journal.c b/fs/bcachefs/journal.c index d1e4a8162ddd..1f7f3b96bd87 100644 --- a/fs/bcachefs/journal.c +++ b/fs/bcachefs/journal.c @@ -979,9 +979,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);