lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <1c7936ea-7bbc-49b7-bc85-b877129272f9@huaweicloud.com> Date: Mon, 30 Sep 2024 10:37:19 +0800 From: Zhang Yi <yi.zhang@...weicloud.com> To: Ye Bin <yebin@...weicloud.com> Cc: jack@...e.cz, zhangxiaoxu5@...wei.com, tytso@....edu, adilger.kernel@...ger.ca, linux-ext4@...r.kernel.org Subject: Re: [PATCH v2 3/6] jbd2: refactor JBD2_COMMIT_BLOCK process in do_one_pass() On 2024/9/30 8:59, Ye Bin wrote: > From: Ye Bin <yebin10@...wei.com> > > To make JBD2_COMMIT_BLOCK process more clean, no functional change. > > Signed-off-by: Ye Bin <yebin10@...wei.com> > Reviewed-by: Jan Kara <jack@...e.cz> Looks good to me. Reviewed-by: Zhang Yi <yi.zhang@...wei.com> > --- > fs/jbd2/recovery.c | 55 ++++++++++++++++++++++++---------------------- > 1 file 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; >
Powered by blists - more mailing lists