From: Wei Fang <fangwei1@huawei.com>
To: <computersforpeace@gmail.com>, <dwmw2@infradead.org>
Cc: linux-mtd@lists.infradead.org
Subject: [PATCH] jffs2: remove unneeded conditions
Date: Sat, 27 Jun 2015 16:07:37 +0800 [thread overview]
Message-ID: <558E59C9.2070207@huawei.com> (raw)
Since len must not be smaller than JFFS2_MIN_NODE_HEADER, if
"len < X" is true, than "JFFS2_MIN_NODE_HEADER < X" must be true,
so it can be removed.
Signed-off-by: Wei Fang <fangwei1@huawei.com>
---
fs/jffs2/readinode.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/fs/jffs2/readinode.c b/fs/jffs2/readinode.c
index dddbde4..b9bd3ad 100644
--- a/fs/jffs2/readinode.c
+++ b/fs/jffs2/readinode.c
@@ -1059,8 +1059,7 @@ static int jffs2_get_inode_nodes(struct jffs2_sb_info *c, struct jffs2_inode_inf
case JFFS2_NODETYPE_DIRENT:
- if (JFFS2_MIN_NODE_HEADER < sizeof(struct jffs2_raw_dirent) &&
- len < sizeof(struct jffs2_raw_dirent)) {
+ if (len < sizeof(struct jffs2_raw_dirent)) {
err = read_more(c, ref, sizeof(struct jffs2_raw_dirent), &len, buf);
if (unlikely(err))
goto free_out;
@@ -1074,8 +1073,7 @@ static int jffs2_get_inode_nodes(struct jffs2_sb_info *c, struct jffs2_inode_inf
case JFFS2_NODETYPE_INODE:
- if (JFFS2_MIN_NODE_HEADER < sizeof(struct jffs2_raw_inode) &&
- len < sizeof(struct jffs2_raw_inode)) {
+ if (len < sizeof(struct jffs2_raw_inode)) {
err = read_more(c, ref, sizeof(struct jffs2_raw_inode), &len, buf);
if (unlikely(err))
goto free_out;
@@ -1088,8 +1086,7 @@ static int jffs2_get_inode_nodes(struct jffs2_sb_info *c, struct jffs2_inode_inf
break;
default:
- if (JFFS2_MIN_NODE_HEADER < sizeof(struct jffs2_unknown_node) &&
- len < sizeof(struct jffs2_unknown_node)) {
+ if (len < sizeof(struct jffs2_unknown_node)) {
err = read_more(c, ref, sizeof(struct jffs2_unknown_node), &len, buf);
if (unlikely(err))
goto free_out;
--
1.8.3.1
next reply other threads:[~2015-06-27 8:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-27 8:07 Wei Fang [this message]
2015-07-07 20:18 ` [PATCH] jffs2: remove unneeded conditions Brian Norris
2015-07-08 1:45 ` Sheng Yong
2015-07-09 2:02 ` Wei Fang
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=558E59C9.2070207@huawei.com \
--to=fangwei1@huawei.com \
--cc=computersforpeace@gmail.com \
--cc=dwmw2@infradead.org \
--cc=linux-mtd@lists.infradead.org \
/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).