linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ye Bin <yebin@huaweicloud.com>
To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org
Cc: jack@suse.cz, zhangxiaoxu5@huawei.com
Subject: [PATCH v2 5/6] jbd2: remove useless 'block_error' variable
Date: Mon, 30 Sep 2024 08:59:41 +0800	[thread overview]
Message-ID: <20240930005942.626942-6-yebin@huaweicloud.com> (raw)
In-Reply-To: <20240930005942.626942-1-yebin@huaweicloud.com>

From: Ye Bin <yebin10@huawei.com>

The judgement 'if (block_error && success == 0)' is never valid. Just
remove useless 'block_error' variable.

Signed-off-by: Ye Bin <yebin10@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
---
 fs/jbd2/recovery.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/fs/jbd2/recovery.c b/fs/jbd2/recovery.c
index 046744d6239c..4f1e9ca34503 100644
--- a/fs/jbd2/recovery.c
+++ b/fs/jbd2/recovery.c
@@ -490,7 +490,7 @@ static __always_inline int jbd2_do_replay(journal_t *journal,
 					  struct buffer_head *bh,
 					  unsigned long *next_log_block,
 					  unsigned int next_commit_ID,
-					  int *success, int *block_error)
+					  int *success)
 {
 	char *tagp;
 	int flags;
@@ -542,7 +542,6 @@ static __always_inline int jbd2_do_replay(journal_t *journal,
 				*success = -EFSBADCRC;
 				pr_err("JBD2: Invalid checksum recovering data block %llu in journal block %lu\n",
 				      blocknr, io_block);
-				*block_error = 1;
 				goto skip_write;
 			}
 
@@ -596,7 +595,6 @@ static int do_one_pass(journal_t *journal,
 	unsigned int		sequence;
 	int			blocktype;
 	__u32			crc32_sum = ~0; /* Transactional Checksums */
-	int			block_error = 0;
 	bool			need_check_commit_time = false;
 	__u64			last_trans_commit_time = 0, commit_time;
 
@@ -721,8 +719,7 @@ static int do_one_pass(journal_t *journal,
 			 * done here!
 			 */
 			err = jbd2_do_replay(journal, info, bh, &next_log_block,
-					     next_commit_ID, &success,
-					     &block_error);
+					     next_commit_ID, &success);
 			if (err)
 				goto failed;
 
@@ -913,8 +910,6 @@ static int do_one_pass(journal_t *journal,
 			success = err;
 	}
 
-	if (block_error && success == 0)
-		success = -EIO;
 	return success;
 
  failed:
-- 
2.31.1


  parent reply	other threads:[~2024-09-30  0:50 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-30  0:59 [PATCH v2 0/6] some cleanup and refactor for jbd2 journal recover Ye Bin
2024-09-30  0:59 ` [PATCH v2 1/6] jbd2: remove redundant judgments for check v1 checksum Ye Bin
2024-09-30  2:36   ` Zhang Yi
2024-09-30  0:59 ` [PATCH v2 2/6] jbd2: unified release of buffer_head in do_one_pass() Ye Bin
2024-09-30  2:36   ` Zhang Yi
2024-09-30  0:59 ` [PATCH v2 3/6] jbd2: refactor JBD2_COMMIT_BLOCK process " Ye Bin
2024-09-30  2:37   ` Zhang Yi
2024-09-30  0:59 ` [PATCH v2 4/6] jbd2: factor out jbd2_do_replay() Ye Bin
2024-09-30  2:40   ` Zhang Yi
2024-09-30 10:30   ` Jan Kara
2024-09-30  0:59 ` Ye Bin [this message]
2024-09-30  2:41   ` [PATCH v2 5/6] jbd2: remove useless 'block_error' variable Zhang Yi
2024-09-30  0:59 ` [PATCH v2 6/6] jbd2: remove the 'success' parameter from the jbd2_do_replay() function Ye Bin
2024-09-30  2:43   ` Zhang Yi
2024-09-30 10:32   ` Jan Kara
2024-11-07 15:13 ` [PATCH v2 0/6] some cleanup and refactor for jbd2 journal recover Theodore Ts'o

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240930005942.626942-6-yebin@huaweicloud.com \
    --to=yebin@huaweicloud.com \
    --cc=adilger.kernel@dilger.ca \
    --cc=jack@suse.cz \
    --cc=linux-ext4@vger.kernel.org \
    --cc=tytso@mit.edu \
    --cc=zhangxiaoxu5@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).