aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ceph/acl.c')
-rw-r--r--fs/ceph/acl.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ceph/acl.c b/fs/ceph/acl.c
index 64fa248343f6..d7496e3dbfc4 100644
--- a/fs/ceph/acl.c
+++ b/fs/ceph/acl.c
@@ -94,11 +94,9 @@ int ceph_set_acl(struct inode *inode, struct posix_acl *acl, int type)
94 case ACL_TYPE_ACCESS: 94 case ACL_TYPE_ACCESS:
95 name = POSIX_ACL_XATTR_ACCESS; 95 name = POSIX_ACL_XATTR_ACCESS;
96 if (acl) { 96 if (acl) {
97 ret = posix_acl_equiv_mode(acl, &new_mode); 97 ret = posix_acl_update_mode(inode, &new_mode, &acl);
98 if (ret < 0) 98 if (ret)
99 goto out; 99 goto out;
100 if (ret == 0)
101 acl = NULL;
102 } 100 }
103 break; 101 break;
104 case ACL_TYPE_DEFAULT: 102 case ACL_TYPE_DEFAULT: