linux-kernel - [PATCH v2 8/8] jbd2: remove unneeded check of ret in jbd2_fc_get

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20240731062247.2380440-9-shikemeng@huaweicloud.com>
Date: Wed, 31 Jul 2024 14:22:47 +0800
From: Kemeng Shi <shikemeng@...weicloud.com>
To: tytso@....edu,
	jack@...e.com
Cc: linux-ext4@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: [PATCH v2 8/8] jbd2: remove unneeded check of ret in jbd2_fc_get_buf

Simply return -EINVAL if j_fc_off is invalid to avoid repeated check of
ret.

Signed-off-by: Kemeng Shi <shikemeng@...weicloud.com>
Reviewed-by: Jan Kara <jack@...e.cz>
---
 fs/jbd2/journal.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index e89d777ded34..9d0f6735f8e6 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -841,12 +841,8 @@ int jbd2_fc_get_buf(journal_t *journal, struct buffer_head **bh_out)
 		fc_off = journal->j_fc_off;
 		blocknr = journal->j_fc_first + fc_off;
 		journal->j_fc_off++;
-	} else {
-		ret = -EINVAL;
-	}
-
-	if (ret)
-		return ret;
+	} else
+		return -EINVAL;
 
 	ret = jbd2_journal_bmap(journal, blocknr, &pblock);
 	if (ret)
-- 
2.30.0