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

diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index 7f0b362b38429feba6f34554b8edcc1f9f506582..2494095e0340b6c30c450a01c575304b3f4fa4f3 100644 (file)
--- 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);