jbd2: switch to use jbd2_journal_abort() when failed to submit the commit record

[ 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>

diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index 2a42904bcd62c6ee5d971c02b36eed0bc3009317..754ec3c47d6fbdecdf0225578aecafe87634b4bc 100644 (file)
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -784,7 +784,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);
@@ -877,7 +877,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);