From a325b76fa21e79b8897bc32c5023fefada2b6994 Mon Sep 17 00:00:00 2001 From: "zhangyi (F)" Date: Tue, 10 Dec 2019 18:27:34 +0800 Subject: [PATCH] jbd2: switch to use jbd2_journal_abort() when failed to submit the commit record hulk inclusion category: bugfix bugzilla: 27215 CVE: NA --------------------------- 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(). Links: https://patchwork.ozlabs.org/patch/1204154/ Fixes: 818d276ceb83a ("ext4: Add the journal checksum feature") Signed-off-by: zhangyi (F) Reviewed-by: Jan Kara Reviewed-by: yang erkun Signed-off-by: Yang Yingliang --- fs/jbd2/commit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 24f86ffe11d7..04a1ee8db783 100644 --- 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); @@ -873,7 +873,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); -- GitLab