lkml.org 
[lkml]   [2020]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 069/113] jbd2: switch to use jbd2_journal_abort() when failed to submit the commit record
    Date
    From: zhangyi (F) <yi.zhang@huawei.com>

    [ Upstream commit d0a186e0d3e7ac05cc77da7c157dae5aa59f95d9 ]

    We invoke jbd2_journal_abort() to abort the journal and record errno
    in the jbd2 superblock when committing journal transaction besides the
    failure on submitting the commit record. But there is no need for the
    case and we can also invoke jbd2_journal_abort() instead of
    __jbd2_journal_abort_hard().

    Fixes: 818d276ceb83a ("ext4: Add the journal checksum feature")
    Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
    Reviewed-by: Jan Kara <jack@suse.cz>
    Link: https://lore.kernel.org/r/20191204124614.45424-2-yi.zhang@huawei.com
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/jbd2/commit.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
    index 7fe61edb1bb9e..a7d12dd6d56e8 100644
    --- a/fs/jbd2/commit.c
    +++ b/fs/jbd2/commit.c
    @@ -797,7 +797,7 @@ start_journal_io:
    err = journal_submit_commit_record(journal, commit_transaction,
    &cbh, crc32_sum);
    if (err)
    - __jbd2_journal_abort_hard(journal);
    + jbd2_journal_abort(journal, err);
    }

    blk_finish_plug(&plug);
    @@ -890,7 +890,7 @@ start_journal_io:
    err = journal_submit_commit_record(journal, commit_transaction,
    &cbh, crc32_sum);
    if (err)
    - __jbd2_journal_abort_hard(journal);
    + jbd2_journal_abort(journal, err);
    }
    if (cbh)
    err = journal_wait_on_commit_record(journal, cbh);
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-02-27 14:44    [W:4.341 / U:0.180 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site