From: Yan, Zheng Date: Tue, 11 Feb 2014 05:08:51 +0000 (+0800) Subject: ceph: fix ceph_set_acl() X-Git-Tag: accepted/tizen/common/20141203.182822~547^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7a92d64760541e66bf5d1131f029b82773ce3922;p=platform%2Fkernel%2Flinux-arm64.git ceph: fix ceph_set_acl() If acl is equivalent to file mode permission bits, ceph_set_acl() needs to remove any existing acl xattr. Use __ceph_setxattr() to handle both setting and removing acl xattr cases, it doesn't return -ENODATA when there is no acl xattr. Signed-off-by: Yan, Zheng --- diff --git a/fs/ceph/acl.c b/fs/ceph/acl.c index 4c2d452..accc9f2 100644 --- a/fs/ceph/acl.c +++ b/fs/ceph/acl.c @@ -160,11 +160,7 @@ int ceph_set_acl(struct inode *inode, struct posix_acl *acl, int type) goto out_dput; } - if (value) - ret = __ceph_setxattr(dentry, name, value, size, 0); - else - ret = __ceph_removexattr(dentry, name); - + ret = __ceph_setxattr(dentry, name, value, size, 0); if (ret) { if (new_mode != old_mode) { newattrs.ia_mode = old_mode;