Fixes: 85e0c4e89c1b "jbd2: if the journal is aborted then don't allow update of the log tail" If journal is dirty when mount, it will be replayed but jbd2 sb log tail cannot be updated to mark a new start because journal->j_flags has already been set with JBD2_ABORT first in journal_init_common. When a new transaction is committed, it will be recorded in block 1 first(journal->j_tail is set to 1 in journal_reset). If emergency restart again before journal super block is updated unfortunately, the new recorded trans will not be replayed in the next mount. It is danerous which may lead to metadata corruption for file system. Signed-off-by: Kai Li <li.kai4@xxxxxxx> --- fs/jbd2/journal.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 5e408ee24a1a..069b22eba795 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -1710,6 +1710,11 @@ int jbd2_journal_load(journal_t *journal) journal->j_devname); return -EFSCORRUPTED; } + /* + * 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 @@ -1717,7 +1722,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; -- 2.24.0.windows.2
