Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
fs
/
btrfs
/
acl.c
diff --git
a/kernel/fs/btrfs/acl.c
b/kernel/fs/btrfs/acl.c
index
9a0124a
..
fb3e64d
100644
(file)
--- a/
kernel/fs/btrfs/acl.c
+++ b/
kernel/fs/btrfs/acl.c
@@
-83,11
+83,9
@@
static int __btrfs_set_acl(struct btrfs_trans_handle *trans,
case ACL_TYPE_ACCESS:
name = POSIX_ACL_XATTR_ACCESS;
if (acl) {
case ACL_TYPE_ACCESS:
name = POSIX_ACL_XATTR_ACCESS;
if (acl) {
- ret = posix_acl_
equiv_mode(acl, &inode->i_mode
);
- if (ret
< 0
)
+ ret = posix_acl_
update_mode(inode, &inode->i_mode, &acl
);
+ if (ret)
return ret;
return ret;
- if (ret == 0)
- acl = NULL;
}
ret = 0;
break;
}
ret = 0;
break;