Merge tag 'nios2-v4.1-rc1' of git://git.rocketboards.org/linux-socfpga-next

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

diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index 1e09fc77395ce0c7cc20496161f09cf0d6eefdbd..759842ff8af050be473ce3cab3b754d7f413a67d 100644 (file)
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -55,7 +55,6 @@
 #include <linux/slab.h>
 #include <linux/mbcache.h>
 #include <linux/quotaops.h>
-#include <linux/rwsem.h>
 #include "ext4_jbd2.h"
 #include "ext4.h"
 #include "xattr.h"
@@ -639,8 +638,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;
        }