]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
jbd2: clear JBD2_ABORT flag before journal_reset to update log tail info when load...
authorKai Li <li.kai4@h3c.com>
Sat, 11 Jan 2020 02:25:42 +0000 (10:25 +0800)
committerBen Hutchings <ben@decadent.org.uk>
Fri, 22 May 2020 20:19:29 +0000 (21:19 +0100)
commit1b0d263daed194db05df28a2a10e39fea767fcc1
treeae3f4de033450148c7318aa330945a0aae15a6b6
parent3ef0444d6fe6047ba23aa4b1e7e214980edf8903
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 <li.kai4@h3c.com>
Link: https://lore.kernel.org/r/20200111022542.5008-1-li.kai4@h3c.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
fs/jbd2/journal.c