diff options
| author | Ye Bin <yebin10@huawei.com> | 2024-09-30 08:59:39 +0800 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2024-11-12 23:54:14 -0500 |
| commit | a805ae3ab9dc75079686cd2889fd563915e90b9d (patch) | |
| tree | 4ff6ff6914e0058bf47a8c6754900ac13001199a /fs/jbd2 | |
| parent | 4c199241b662c7c992dbb2d5176b48a77d8c9291 (diff) | |
| download | linux-stable-a805ae3ab9dc75079686cd2889fd563915e90b9d.tar.gz linux-stable-a805ae3ab9dc75079686cd2889fd563915e90b9d.tar.bz2 linux-stable-a805ae3ab9dc75079686cd2889fd563915e90b9d.zip | |
jbd2: refactor JBD2_COMMIT_BLOCK process in do_one_pass()
To make JBD2_COMMIT_BLOCK process more clean, no functional change.
Signed-off-by: Ye Bin <yebin10@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Zhang Yi <yi.zhang@huawei.com>
Link: https://patch.msgid.link/20240930005942.626942-4-yebin@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/jbd2')
| -rw-r--r-- | fs/jbd2/recovery.c | 55 |
1 files changed, 29 insertions, 26 deletions
diff --git a/fs/jbd2/recovery.c b/fs/jbd2/recovery.c index 0adf0cb31a03..0d697979d83e 100644 --- a/fs/jbd2/recovery.c +++ b/fs/jbd2/recovery.c @@ -728,6 +728,11 @@ static int do_one_pass(journal_t *journal, continue; case JBD2_COMMIT_BLOCK: + if (pass != PASS_SCAN) { + next_commit_ID++; + continue; + } + /* How to differentiate between interrupted commit * and journal corruption ? * @@ -790,8 +795,7 @@ static int do_one_pass(journal_t *journal, * much to do other than move on to the next sequence * number. */ - if (pass == PASS_SCAN && - jbd2_has_feature_checksum(journal)) { + if (jbd2_has_feature_checksum(journal)) { struct commit_header *cbh = (struct commit_header *)bh->b_data; unsigned found_chksum = @@ -815,34 +819,33 @@ static int do_one_pass(journal_t *journal, goto chksum_error; crc32_sum = ~0; + goto chksum_ok; } - if (pass == PASS_SCAN && - !jbd2_commit_block_csum_verify(journal, - bh->b_data)) { - if (jbd2_commit_block_csum_verify_partial( - journal, - bh->b_data)) { - pr_notice("JBD2: Find incomplete commit block in transaction %u block %lu\n", - next_commit_ID, next_log_block); - goto chksum_ok; - } - chksum_error: - if (commit_time < last_trans_commit_time) - goto ignore_crc_mismatch; - info->end_transaction = next_commit_ID; - info->head_block = head_block; - if (!jbd2_has_feature_async_commit(journal)) { - journal->j_failed_commit = - next_commit_ID; - break; - } + if (jbd2_commit_block_csum_verify(journal, bh->b_data)) + goto chksum_ok; + + if (jbd2_commit_block_csum_verify_partial(journal, + bh->b_data)) { + pr_notice("JBD2: Find incomplete commit block in transaction %u block %lu\n", + next_commit_ID, next_log_block); + goto chksum_ok; } - if (pass == PASS_SCAN) { - chksum_ok: - last_trans_commit_time = commit_time; - head_block = next_log_block; + +chksum_error: + if (commit_time < last_trans_commit_time) + goto ignore_crc_mismatch; + info->end_transaction = next_commit_ID; + info->head_block = head_block; + + if (!jbd2_has_feature_async_commit(journal)) { + journal->j_failed_commit = next_commit_ID; + break; } + +chksum_ok: + last_trans_commit_time = commit_time; + head_block = next_log_block; next_commit_ID++; continue; |