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 4.9 027/141] ext4, jbd2: ensure panic when aborting with zero errno
    Date
    From: "zhangyi (F)" <yi.zhang@huawei.com>

    [ Upstream commit 51f57b01e4a3c7d7bdceffd84de35144e8c538e7 ]

    JBD2_REC_ERR flag used to indicate the errno has been updated when jbd2
    aborted, and then __ext4_abort() and ext4_handle_error() can invoke
    panic if ERRORS_PANIC is specified. But if the journal has been aborted
    with zero errno, jbd2_journal_abort() didn't set this flag so we can
    no longer panic. Fix this by always record the proper errno in the
    journal superblock.

    Fixes: 4327ba52afd03 ("ext4, jbd2: ensure entering into panic after recording an error in superblock")
    Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
    Reviewed-by: Jan Kara <jack@suse.cz>
    Link: https://lore.kernel.org/r/20191204124614.45424-3-yi.zhang@huawei.com
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/jbd2/checkpoint.c | 2 +-
    fs/jbd2/journal.c | 15 ++++-----------
    2 files changed, 5 insertions(+), 12 deletions(-)

    diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
    index 4d5a5a4cc017c..addb0784dd1c4 100644
    --- a/fs/jbd2/checkpoint.c
    +++ b/fs/jbd2/checkpoint.c
    @@ -168,7 +168,7 @@ void __jbd2_log_wait_for_space(journal_t *journal)
    "journal space in %s\n", __func__,
    journal->j_devname);
    WARN_ON(1);
    - jbd2_journal_abort(journal, 0);
    + jbd2_journal_abort(journal, -EIO);
    }
    write_lock(&journal->j_state_lock);
    } else {
    diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
    index 40c754854b29e..efc8cfd060730 100644
    --- a/fs/jbd2/journal.c
    +++ b/fs/jbd2/journal.c
    @@ -2100,12 +2100,10 @@ static void __journal_abort_soft (journal_t *journal, int errno)

    __jbd2_journal_abort_hard(journal);

    - if (errno) {
    - jbd2_journal_update_sb_errno(journal);
    - write_lock(&journal->j_state_lock);
    - journal->j_flags |= JBD2_REC_ERR;
    - write_unlock(&journal->j_state_lock);
    - }
    + jbd2_journal_update_sb_errno(journal);
    + write_lock(&journal->j_state_lock);
    + journal->j_flags |= JBD2_REC_ERR;
    + write_unlock(&journal->j_state_lock);
    }

    /**
    @@ -2147,11 +2145,6 @@ static void __journal_abort_soft (journal_t *journal, int errno)
    * failure to disk. ext3_error, for example, now uses this
    * functionality.
    *
    - * Errors which originate from within the journaling layer will NOT
    - * supply an errno; a null errno implies that absolutely no further
    - * writes are done to the journal (unless there are any already in
    - * progress).
    - *
    */

    void jbd2_journal_abort(journal_t *journal, int errno)
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 17:44    [W:2.656 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site