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/zfs_vfsops.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/zfs_vfsops.c')
| -rw-r--r-- | module/zfs/zfs_vfsops.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/module/zfs/zfs_vfsops.c b/module/zfs/zfs_vfsops.c index 9fc6c6fe1..9097273e4 100644 --- a/module/zfs/zfs_vfsops.c +++ b/module/zfs/zfs_vfsops.c @@ -165,8 +165,13 @@ acltype_changed_cb(void *arg, uint64_t newval) zsb->z_sb->s_flags &= ~MS_POSIXACL; break; case ZFS_ACLTYPE_POSIXACL: +#ifdef CONFIG_FS_POSIX_ACL zsb->z_acl_type = ZFS_ACLTYPE_POSIXACL; zsb->z_sb->s_flags |= MS_POSIXACL; +#else + zsb->z_acl_type = ZFS_ACLTYPE_OFF; + zsb->z_sb->s_flags &= ~MS_POSIXACL; +#endif /* CONFIG_FS_POSIX_ACL */ break; default: break; |