aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authortuxoko <[email protected]>2016-11-09 10:37:17 -0800
committerBrian Behlendorf <[email protected]>2016-11-09 10:37:17 -0800
commit0420c126ce11432590bce1da651334ca07223185 (patch)
treea8265be359b2b9b94705f0ea2c83be79132f8ca3 /include
parent66f801f00acbc83206b5c2af9e44de45da2602a3 (diff)
Linux 3.14 compat: assign inode->set_acl
Linux 3.14 introduces inode->set_acl(). Normally, acl modification will come from setxattr, which will handle by the acl xattr_handler, and we already handles that well. However, nfsd will directly calls inode->set_acl or return error if it doesn't exists. Reviewed-by: Tim Chase <[email protected]> Reviewed-by: Massimo Maggi <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Chunwei Chen <[email protected]> Closes #5371 Closes #5375
Diffstat (limited to 'include')
-rw-r--r--include/sys/zpl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sys/zpl.h b/include/sys/zpl.h
index 386cf6d09..174d40efa 100644
--- a/include/sys/zpl.h
+++ b/include/sys/zpl.h
@@ -76,7 +76,7 @@ extern ssize_t zpl_xattr_list(struct dentry *dentry, char *buf, size_t size);
extern int zpl_xattr_security_init(struct inode *ip, struct inode *dip,
const struct qstr *qstr);
#if defined(CONFIG_FS_POSIX_ACL)
-extern int zpl_set_acl(struct inode *ip, int type, struct posix_acl *acl);
+extern int zpl_set_acl(struct inode *ip, struct posix_acl *acl, int type);
extern struct posix_acl *zpl_get_acl(struct inode *ip, int type);
#if !defined(HAVE_GET_ACL)
#if defined(HAVE_CHECK_ACL_WITH_FLAGS)