summaryrefslogtreecommitdiffstats
path: root/module/zfs
diff options
context:
space:
mode:
authorChunwei Chen <[email protected]>2014-03-28 12:59:36 +0800
committerBrian Behlendorf <[email protected]>2014-04-10 14:27:03 -0700
commit408ec0d2e13188f6f500f7010b5bc5bc5bf5bb9c (patch)
tree676aa1a36122af179ce424eaed6441d055e867a6 /module/zfs
parent443c3f73321d18d0092b11390e628e3de9d15d7c (diff)
Linux 3.14 compat: posix_acl_{create,chmod}
posix_acl_{create,chmod} is changed to __posix_acl_{create_chmod} Signed-off-by: Chunwei Chen <[email protected]> Signed-off-by: Richard Yao <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Issue #2124
Diffstat (limited to 'module/zfs')
-rw-r--r--module/zfs/zpl_xattr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/zpl_xattr.c b/module/zfs/zpl_xattr.c
index 9334ae7d1..c5c15a2dd 100644
--- a/module/zfs/zpl_xattr.c
+++ b/module/zfs/zpl_xattr.c
@@ -924,7 +924,7 @@ zpl_init_acl(struct inode *ip, struct inode *dir)
}
mode = ip->i_mode;
- error = posix_acl_create(&acl, GFP_KERNEL, &mode);
+ error = __posix_acl_create(&acl, GFP_KERNEL, &mode);
if (error >= 0) {
ip->i_mode = mode;
mark_inode_dirty(ip);
@@ -954,7 +954,7 @@ zpl_chmod_acl(struct inode *ip)
if (IS_ERR(acl) || !acl)
return (PTR_ERR(acl));
- error = posix_acl_chmod(&acl, GFP_KERNEL, ip->i_mode);
+ error = __posix_acl_chmod(&acl, GFP_KERNEL, ip->i_mode);
if (!error)
error = zpl_set_acl(ip, ACL_TYPE_ACCESS, acl);