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-Tag: v3.16.84~29 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=592eef925e593e2a9a542f3e6ae176f4c1b8379e;p=thirdparty%2Fkernel%2Fstable.git jbd2: switch to use jbd2_journal_abort() when failed to submit the commit record commit d0a186e0d3e7ac05cc77da7c157dae5aa59f95d9 upstream. 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 Signed-off-by: Ben Hutchings --- diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 362e5f614450e..943a575a8704f 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -802,7 +802,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); @@ -894,7 +894,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);