| Message ID | 20191203092756.26129-2-yi.zhang@huawei.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ext4, jbd2: improve aborting progress | expand |
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) <yi.zhang@huawei.com> Besides the spelling fix the patch looks good to me. You can add: Reviewed-by: Jan Kara <jack@suse.cz> 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 >
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);
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) <yi.zhang@huawei.com> --- fs/jbd2/commit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)