Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[firefly-linux-kernel-4.4.55.git] / fs / ext3 / xattr.c

diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
index a5591d721b555b3f6728ba6687accc306bf541c7..7cf36501ccf46c21f5a5ed979c86eec6ef7906df 100644 (file)
--- a/fs/ext3/xattr.c
+++ b/fs/ext3/xattr.c
@@ -546,8 +546,7 @@ ext3_xattr_set_entry(struct ext3_xattr_info *i, struct ext3_xattr_search *s)
                free += EXT3_XATTR_LEN(name_len);
        }
        if (i->value) {
-               if (free < EXT3_XATTR_SIZE(i->value_len) ||
-                   free < EXT3_XATTR_LEN(name_len) +
+               if (free < EXT3_XATTR_LEN(name_len) +
                           EXT3_XATTR_SIZE(i->value_len))
                        return -ENOSPC;
        }