ocfs2: call journal flush to mark journal as empty after journal recovery when mount

[mirror_ubuntu-focal-kernel.git] / fs / ocfs2 / journal.c

diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index 699a560efbb02b498b01ba2df49f5b334766fa59..900e4ef686bfc1cb0229e57ed31269f4fd5426d3 100644 (file)
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -1066,6 +1066,14 @@ int ocfs2_journal_load(struct ocfs2_journal *journal, int local, int replayed)
 
        ocfs2_clear_journal_error(osb->sb, journal->j_journal, osb->slot_num);
 
+       if (replayed) {
+               jbd2_journal_lock_updates(journal->j_journal);
+               status = jbd2_journal_flush(journal->j_journal);
+               jbd2_journal_unlock_updates(journal->j_journal);
+               if (status < 0)
+                       mlog_errno(status);
+       }
+
        status = ocfs2_journal_toggle_dirty(osb, 1, replayed);
        if (status < 0) {
                mlog_errno(status);