lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 073/459] jbd2: clear JBD2_ABORT flag before journal_reset to update log tail info when load journal
    Date
    From: Kai Li <li.kai4@h3c.com>

    [ Upstream commit a09decff5c32060639a685581c380f51b14e1fc2 ]

    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: Sasha Levin <sashal@kernel.org>
    ---
    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 ef485f892d1b0..389c9be4e7919 100644
    --- a/fs/jbd2/journal.c
    +++ b/fs/jbd2/journal.c
    @@ -1682,6 +1682,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
    @@ -1689,7 +1694,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.20.1
    \
     
     \ /
      Last update: 2020-02-14 18:43    [W:5.119 / U:1.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site