mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-09 18:19:06 +00:00
jbd2: switch to use jbd2_journal_abort() when failed to submit the commit record
[ Upstream commitd0a186e0d3
] 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:818d276ceb
("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>
This commit is contained in:
parent
634efb7504
commit
d61ce1d0cd
1 changed files with 2 additions and 2 deletions
|
@ -781,7 +781,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);
|
||||
|
@ -874,7 +874,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);
|
||||
|
|
Loading…
Reference in a new issue