Merge tag 'juno-fix-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep...

[linux.git] / fs / jbd2 / commit.c

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 @@ void jbd2_journal_commit_transaction(journal_t *journal)
                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 @@ void jbd2_journal_commit_transaction(journal_t *journal)
                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);