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_super.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_super.c')
-rw-r--r-- | module/zfs/zpl_super.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/module/zfs/zpl_super.c b/module/zfs/zpl_super.c index 72859ac5c..92779bcab 100644 --- a/module/zfs/zpl_super.c +++ b/module/zfs/zpl_super.c @@ -198,6 +198,7 @@ __zpl_show_options(struct seq_file *seq, zfs_sb_t *zsb) { seq_printf(seq, ",%s", zsb->z_flags & ZSB_XATTR ? "xattr" : "noxattr"); +#ifdef CONFIG_FS_POSIX_ACL switch (zsb->z_acl_type) { case ZFS_ACLTYPE_POSIXACL: seq_puts(seq, ",posixacl"); @@ -206,6 +207,7 @@ __zpl_show_options(struct seq_file *seq, zfs_sb_t *zsb) seq_puts(seq, ",noacl"); break; } +#endif /* CONFIG_FS_POSIX_ACL */ return (0); } |