Message ID | 1426555914-731-1-git-send-email-weiyuan.wei@huawei.com |
---|---|
State | Accepted, archived |
Headers | show |
On Tue, 17 Mar 2015, Wei Yuan wrote: > Date: Tue, 17 Mar 2015 09:31:54 +0800 > From: Wei Yuan <weiyuan.wei@huawei.com> > To: tytso@mit.edu, adilger.kernel@dilger.ca > Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org > Subject: [PATCH] ext4: Remove useless condition in if statement. > > In this if statement, the previous condition is useless, the later one has covered it. Looks good, thanks! Reviewed-by: Lukas Czerner <lczerner@redhat.com> > > Signed-off-by: Weiyuan <weiyuan.wei@huawei.com> > --- > fs/ext4/xattr.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c > index 1e09fc7..f2ccad7 100644 > --- a/fs/ext4/xattr.c > +++ b/fs/ext4/xattr.c > @@ -639,8 +639,7 @@ ext4_xattr_set_entry(struct ext4_xattr_info *i, struct ext4_xattr_search *s) > free += EXT4_XATTR_LEN(name_len); > } > if (i->value) { > - if (free < EXT4_XATTR_SIZE(i->value_len) || > - free < EXT4_XATTR_LEN(name_len) + > + if (free < EXT4_XATTR_LEN(name_len) + > EXT4_XATTR_SIZE(i->value_len)) > return -ENOSPC; > } > -- > 2.1.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-ext4" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Mar 17, 2015 at 09:31:54AM +0800, Wei Yuan wrote: > In this if statement, the previous condition is useless, the later one has covered it. > > Signed-off-by: Weiyuan <weiyuan.wei@huawei.com> Applied, thanks. - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index 1e09fc7..f2ccad7 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c @@ -639,8 +639,7 @@ ext4_xattr_set_entry(struct ext4_xattr_info *i, struct ext4_xattr_search *s) free += EXT4_XATTR_LEN(name_len); } if (i->value) { - if (free < EXT4_XATTR_SIZE(i->value_len) || - free < EXT4_XATTR_LEN(name_len) + + if (free < EXT4_XATTR_LEN(name_len) + EXT4_XATTR_SIZE(i->value_len)) return -ENOSPC; }
In this if statement, the previous condition is useless, the later one has covered it. Signed-off-by: Weiyuan <weiyuan.wei@huawei.com> --- fs/ext4/xattr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html