diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-01-03 10:58:00 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-01-03 10:58:00 +0800 |
| commit | 67f07b48af22065412ba4e78472121c0a9f58329 (patch) | |
| tree | 18e5148ef910dcab382a98ff7b46172da0bf13bc /fs/ceph/acl.c | |
| parent | a5e9874fc9e05e8471bfd58cabd75a3432d38ba6 (diff) | |
| parent | 35327468a79dd9e343eaf7e66cc372f8277b2a84 (diff) | |
Merge tag 'v4.1.37' into linux-linaro-lsk-v4.1
This is the 4.1.37 stable release
Diffstat (limited to 'fs/ceph/acl.c')
| -rw-r--r-- | fs/ceph/acl.c | 6 |
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) case ACL_TYPE_ACCESS: name = POSIX_ACL_XATTR_ACCESS; if (acl) { - ret = posix_acl_equiv_mode(acl, &new_mode); - if (ret < 0) + ret = posix_acl_update_mode(inode, &new_mode, &acl); + if (ret) goto out; - if (ret == 0) - acl = NULL; } break; case ACL_TYPE_DEFAULT: |