The size check at the start of ll_setstripe_ea() is only
valid for a directory. Move that check to the section of
code handling the S_ISDIR case.

Signed-off-by: James Simmons <uja.o...@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-9183
Reviewed-on: https://review.whamcloud.com/27240
Reviewed-by: Dmitry Eremin <dmitry.ere...@intel.com>
Reviewed-by: Bob Glossman <bob.gloss...@intel.com>
Reviewed-by: Sebastien Buisson <sbuis...@ddn.com>
Reviewed-by: Oleg Drokin <oleg.dro...@intel.com>
Signed-off-by: James Simmons <jsimm...@infradead.org>
---
 drivers/staging/lustre/lustre/llite/xattr.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/lustre/lustre/llite/xattr.c 
b/drivers/staging/lustre/lustre/llite/xattr.c
index 86b5df9..a54be09 100644
--- a/drivers/staging/lustre/lustre/llite/xattr.c
+++ b/drivers/staging/lustre/lustre/llite/xattr.c
@@ -235,9 +235,6 @@ static int ll_setstripe_ea(struct dentry *dentry, struct 
lov_user_md *lump,
        struct inode *inode = d_inode(dentry);
        int rc = 0;
 
-       if (size != 0 && size < sizeof(struct lov_user_md))
-               return -EINVAL;
-
        /*
         * It is possible to set an xattr to a "" value of zero size.
         * For this case we are going to treat it as a removal.
@@ -270,6 +267,9 @@ static int ll_setstripe_ea(struct dentry *dentry, struct 
lov_user_md *lump,
                if (rc == -EEXIST)
                        rc = 0;
        } else if (S_ISDIR(inode->i_mode)) {
+               if (size != 0 && size < sizeof(struct lov_user_md))
+                       return -EINVAL;
+
                rc = ll_dir_setstripe(inode, lump, 0);
        }
 
-- 
1.8.3.1

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to