From: zhangyi (F) Date: Wed, 4 Dec 2019 12:46:11 +0000 (+0800) Subject: jbd2: switch to use jbd2_journal_abort() when failed to submit the commit record X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d0a186e0d3e7ac05cc77da7c157dae5aa59f95d9;p=linux.git jbd2: switch to use jbd2_journal_abort() when failed to submit the commit record 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) Reviewed-by: Jan Kara Link: https://lore.kernel.org/r/20191204124614.45424-2-yi.zhang@huawei.com Signed-off-by: Theodore Ts'o --- diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 7f0b362b38429..2494095e0340b 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -782,7 +782,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); @@ -875,7 +875,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);