diff options
| author | Massimo Maggi <[email protected]> | 2013-11-03 00:40:26 +0100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2013-11-05 16:22:05 -0800 |
| commit | b695c34ea4ca3037cfbc0fe7a9283334b761abc1 (patch) | |
| tree | 1b34e3708386e3478ceb157168b1f12c8feed8be /module/zfs/zpl_xattr.c | |
| parent | 78e2739d3c9e433c92cd1623a510edb2c83a97d9 (diff) | |
Honor CONFIG_FS_POSIX_ACL kernel option
The required Posix ACL interfaces are only available for kernels
with CONFIG_FS_POSIX_ACL defined. Therefore, only enable Posix
ACL support for these kernels. All major distribution kernels
enable CONFIG_FS_POSIX_ACL by default.
If your kernel does not support Posix ACLs the following warning
will be printed at ZFS module load time.
"ZFS: Posix ACLs disabled by kernel"
Signed-off-by: Massimo Maggi <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #1825
Diffstat (limited to 'module/zfs/zpl_xattr.c')
| -rw-r--r-- | module/zfs/zpl_xattr.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/module/zfs/zpl_xattr.c b/module/zfs/zpl_xattr.c index 276ea3361..63dca3ae7 100644 --- a/module/zfs/zpl_xattr.c +++ b/module/zfs/zpl_xattr.c @@ -722,6 +722,8 @@ xattr_handler_t zpl_xattr_security_handler = { .set = zpl_xattr_security_set, }; +#ifdef CONFIG_FS_POSIX_ACL + int zpl_set_acl(struct inode *ip, int type, struct posix_acl *acl) { @@ -1187,11 +1189,15 @@ struct xattr_handler zpl_xattr_acl_default_handler = #endif /* HAVE_DENTRY_XATTR_LIST */ }; +#endif /* CONFIG_FS_POSIX_ACL */ + xattr_handler_t *zpl_xattr_handlers[] = { &zpl_xattr_security_handler, &zpl_xattr_trusted_handler, &zpl_xattr_user_handler, +#ifdef CONFIG_FS_POSIX_ACL &zpl_xattr_acl_access_handler, &zpl_xattr_acl_default_handler, +#endif /* CONFIG_FS_POSIX_ACL */ NULL }; |