linux-ext4 - [PATCH] ext3: reduce redundant check of '*options'

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>] [day] [month] [year] [list]

Date:	Thu, 13 Jan 2011 20:42:38 +0800
From:	Simon Xu <xu.simon@...cle.com>
To:	jack@...e.cz
Cc:	linux-ext4@...r.kernel.org, linux-kernel@...r.kernel.org,
	Simon Xu <xu.simon@...cle.com>
Subject: [PATCH] ext3: reduce redundant check of '*options'

We don't need to check whether '*options' equals to ',' twice.

Signed-off-by: Simon Xu <xu.simon@...cle.com>
---
 fs/ext3/super.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index b7d0554..dbb84e6 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -891,13 +891,13 @@ static ext3_fsblk_t get_sb_block(void **data, struct super_block *sb)
 	options += 3;
 	/*todo: use simple_strtoll with >32bit ext3 */
 	sb_block = simple_strtoul(options, &options, 0);
-	if (*options && *options != ',') {
+	if (*options == ',') {
+		options++;
+	} else if (*options) {
 		ext3_msg(sb, "error: invalid sb specification: %s",
 		       (char *) *data);
 		return 1;
 	}
-	if (*options == ',')
-		options++;
 	*data = (void *) options;
 	return sb_block;
 }
-- 
1.7.3.5

--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html