blob: 5c499d28b5c747e477579855d512dbd00060b918 [file] [log] [blame]
From 81551cc8d3a297d3c12ca1df547fe6dcc24a604d Mon Sep 17 00:00:00 2001
From: Kai Li <>
Date: Sat, 11 Jan 2020 10:25:42 +0800
Subject: [PATCH] jbd2: clear JBD2_ABORT flag before journal_reset to update
log tail info when load journal
commit a09decff5c32060639a685581c380f51b14e1fc2 upstream.
If the journal is dirty when the filesystem is mounted, jbd2 will replay
the journal but the journal superblock will not be updated by
journal_reset() because JBD2_ABORT flag is still set (it was set in
journal_init_common()). This is problematic because when a new transaction
is then committed, it will be recorded in block 1 (journal->j_tail was set
to 1 in journal_reset()). If unclean shutdown happens again before the
journal superblock is updated, the new recorded transaction will not be
replayed during the next mount (because of stale sb->s_start and
sb->s_sequence values) which can lead to filesystem corruption.
Fixes: 85e0c4e89c1b ("jbd2: if the journal is aborted then don't allow update of the log tail")
Signed-off-by: Kai Li <>
Signed-off-by: Theodore Ts'o <>
Signed-off-by: Paul Gortmaker <>
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 057e9cacab14..14ca083635c0 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -1687,6 +1687,11 @@ int jbd2_journal_load(journal_t *journal)
+ /*
+ * clear JBD2_ABORT flag initialized in journal_init_common
+ * here to update log tail information with the newest seq.
+ */
+ journal->j_flags &= ~JBD2_ABORT;
/* OK, we've finished with the dynamic journal bits:
* reinitialise the dynamic contents of the superblock in memory
@@ -1694,7 +1699,6 @@ int jbd2_journal_load(journal_t *journal)
if (journal_reset(journal))
goto recovery_error;
- journal->j_flags &= ~JBD2_ABORT;
journal->j_flags |= JBD2_LOADED;
return 0;