diff options
| author | Joel Stanley <joel@jms.id.au> | 2016-11-21 02:38:38 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2016-11-21 02:38:47 +0300 |
| commit | c55cf1296a0429d91b940a49a59977617a4e4cb3 (patch) | |
| tree | 11d7ae008a0ad5bfe4110966b6df7c44cff723fd /fs/ceph/acl.c | |
| parent | 5509e6ee766f6b910c3b81c02bae291fc1d9a806 (diff) | |
| parent | 86429bd405de5741df4127096deae0b1d90b68f1 (diff) | |
| download | linux-dev-4.4.tar.xz | |
Merge tag 'v4.4.33' into dev-4.4openbmc-4.4-20161121-1dev-4.4
This is the 4.4.33 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
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 8f84646f10e9..4d8caeb94a11 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: |