summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorMassimo Maggi <[email protected]>2013-11-03 00:40:26 +0100
committerBrian Behlendorf <[email protected]>2013-11-05 16:22:05 -0800
commitb695c34ea4ca3037cfbc0fe7a9283334b761abc1 (patch)
tree1b34e3708386e3478ceb157168b1f12c8feed8be /include/linux
parent78e2739d3c9e433c92cd1623a510edb2c83a97d9 (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 'include/linux')
-rw-r--r--include/linux/vfs_compat.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/vfs_compat.h b/include/linux/vfs_compat.h
index e5371dacd..8ec1bccad 100644
--- a/include/linux/vfs_compat.h
+++ b/include/linux/vfs_compat.h
@@ -174,6 +174,7 @@ lseek_execute(struct file *filp, struct inode *inode,
}
#endif /* SEEK_HOLE && SEEK_DATA && !HAVE_LSEEK_EXECUTE */
+#if defined(CONFIG_FS_POSIX_ACL)
/*
* These functions safely approximates the behavior of posix_acl_release()
* which cannot be used because it calls the GPL-only symbol kfree_rcu().
@@ -315,5 +316,6 @@ typedef umode_t zpl_equivmode_t;
#else
typedef mode_t zpl_equivmode_t;
#endif /* HAVE_POSIX_ACL_EQUIV_MODE_UMODE_T */
+#endif /* CONFIG_FS_POSIX_ACL */
#endif /* _ZFS_VFS_H */