git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
acl: handle idmapped mounts
[sfrench/cifs-2.6.git]
/
fs
/
btrfs
/
acl.c
diff --git
a/fs/btrfs/acl.c
b/fs/btrfs/acl.c
index a0af1b952c4df1c996c6a92da149d818d3b3eac6..d12a5a8730a84ae6647f0d4ed19f7cc1f37298de 100644
(file)
--- a/
fs/btrfs/acl.c
+++ b/
fs/btrfs/acl.c
@@
-113,7
+113,8
@@
int btrfs_set_acl(struct inode *inode, struct posix_acl *acl, int type)
umode_t old_mode = inode->i_mode;
if (type == ACL_TYPE_ACCESS && acl) {
- ret = posix_acl_update_mode(inode, &inode->i_mode, &acl);
+ ret = posix_acl_update_mode(&init_user_ns, inode,
+ &inode->i_mode, &acl);
if (ret)
return ret;
}