summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2016-08-02 10:50:52 -0700
committerBrian Behlendorf <[email protected]>2016-08-08 11:46:32 -0700
commite85a6396b0f7f3cb5a76cf88e47fc1334f9162b7 (patch)
treee6d18dd2f7fbe837442671db4b211309a9e481dc /config
parent64aefee1b847b747147016c039f5b0e276a9e1b7 (diff)
Retire HAVE_CURRENT_UMASK and HAVE_POSIX_ACL_CACHING
Remove ZFS_AC_KERNEL_CURRENT_UMASK and ZFS_AC_KERNEL_POSIX_ACL_CACHING configure checks, all supported kernel provide this functionality. Signed-off-by: Brian Behlendorf <[email protected]> Signed-off-by: Nikolay Borisov <[email protected]> Signed-off-by: Chunwei Chen <[email protected]> Closes #4922
Diffstat (limited to 'config')
-rw-r--r--config/kernel-acl.m439
-rw-r--r--config/kernel.m42
2 files changed, 0 insertions, 41 deletions
diff --git a/config/kernel-acl.m4 b/config/kernel-acl.m4
index ffb6a0254..6ef80fe5e 100644
--- a/config/kernel-acl.m4
+++ b/config/kernel-acl.m4
@@ -77,27 +77,6 @@ AC_DEFUN([ZFS_AC_KERNEL_POSIX_ACL_CHMOD], [
])
dnl #
-dnl # 2.6.30 API change,
-dnl # caching of ACL into the inode was added in this version.
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_POSIX_ACL_CACHING], [
- AC_MSG_CHECKING([whether inode has i_acl and i_default_acl])
- ZFS_LINUX_TRY_COMPILE([
- #include <linux/fs.h>
- ],[
- struct inode ino;
- ino.i_acl = NULL;
- ino.i_default_acl = NULL;
- ],[
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_POSIX_ACL_CACHING, 1,
- [inode contains i_acl and i_default_acl])
- ],[
- AC_MSG_RESULT(no)
- ])
-])
-
-dnl #
dnl # 3.1 API change,
dnl # posix_acl_equiv_mode now wants an umode_t* instead of a mode_t*
dnl #
@@ -246,21 +225,3 @@ AC_DEFUN([ZFS_AC_KERNEL_INODE_OPERATIONS_GET_ACL], [
AC_MSG_RESULT(no)
])
])
-
-dnl #
-dnl # 2.6.30 API change,
-dnl # current_umask exists only since this version.
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_CURRENT_UMASK], [
- AC_MSG_CHECKING([whether current_umask exists])
- ZFS_LINUX_TRY_COMPILE([
- #include <linux/fs.h>
- ],[
- current_umask();
- ],[
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_CURRENT_UMASK, 1, [current_umask() exists])
- ],[
- AC_MSG_RESULT(no)
- ])
-])
diff --git a/config/kernel.m4 b/config/kernel.m4
index 2fa04706b..9eec504f8 100644
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -42,14 +42,12 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
ZFS_AC_KERNEL_POSIX_ACL_FROM_XATTR_USERNS
ZFS_AC_KERNEL_POSIX_ACL_RELEASE
ZFS_AC_KERNEL_POSIX_ACL_CHMOD
- ZFS_AC_KERNEL_POSIX_ACL_CACHING
ZFS_AC_KERNEL_POSIX_ACL_EQUIV_MODE_WANTS_UMODE_T
ZFS_AC_KERNEL_INODE_OPERATIONS_PERMISSION
ZFS_AC_KERNEL_INODE_OPERATIONS_PERMISSION_WITH_NAMEIDATA
ZFS_AC_KERNEL_INODE_OPERATIONS_CHECK_ACL
ZFS_AC_KERNEL_INODE_OPERATIONS_CHECK_ACL_WITH_FLAGS
ZFS_AC_KERNEL_INODE_OPERATIONS_GET_ACL
- ZFS_AC_KERNEL_CURRENT_UMASK
ZFS_AC_KERNEL_SHOW_OPTIONS
ZFS_AC_KERNEL_FILE_INODE
ZFS_AC_KERNEL_FSYNC