2019-12-03 09:08:11

by Zhang Yi

Subject: [PATCH v2 1/4] jbd2: switch to use jbd2_journal_abort() when failed to submit the commit record

We invloke 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 invloke jbd2_journal_abort() instead of
__jbd2_journal_abort_hard().

Fixes: 818d276ceb83a ("ext4: Add the journal checksum feature")
Signed-off-by: zhangyi (F) <[email protected]>
---
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 132fb92098c7..87b88d910306 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -785,7 +785,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);
@@ -876,7 +876,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);
--
2.17.2

2019-12-03 11:59:15

by Jan Kara

Subject: Re: [PATCH v2 1/4] jbd2: switch to use jbd2_journal_abort() when failed to submit the commit record

On Tue 03-12-19 17:27:53, zhangyi (F) wrote:
> We invloke 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 invloke jbd2_journal_abort() instead of
^^^ invoke

> __jbd2_journal_abort_hard().
>
> Fixes: 818d276ceb83a ("ext4: Add the journal checksum feature")
> Signed-off-by: zhangyi (F) <[email protected]>

Besides the spelling fix the patch looks good to me. You can add:

Reviewed-by: Jan Kara <[email protected]>

Honza


> ---
> 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 132fb92098c7..87b88d910306 100644
> --- a/fs/jbd2/commit.c
> +++ b/fs/jbd2/commit.c
> @@ -785,7 +785,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);
> @@ -876,7 +876,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);
> --
> 2.17.2
>
--
Jan Kara <[email protected]>
SUSE Labs, CR