diff options
| -rw-r--r-- | config/kernel-acl.m4 | 39 | ||||
| -rw-r--r-- | config/kernel.m4 | 2 | ||||
| -rw-r--r-- | include/linux/vfs_compat.h | 13 | ||||
| -rw-r--r-- | module/zfs/zpl_xattr.c | 2 |
4 files changed, 0 insertions, 56 deletions
diff --git a/config/kernel-acl.m4 b/config/kernel-acl.m4 index 1cb28b25a..1c98c66b3 100644 --- a/config/kernel-acl.m4 +++ b/config/kernel-acl.m4 @@ -76,27 +76,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 # @@ -245,21 +224,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 a9f1b6acd..81c6250a0 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -40,14 +40,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 diff --git a/include/linux/vfs_compat.h b/include/linux/vfs_compat.h index bcec1146a..4eac39dec 100644 --- a/include/linux/vfs_compat.h +++ b/include/linux/vfs_compat.h @@ -202,9 +202,6 @@ lseek_execute( * At 60 seconds the kernel will also begin issuing RCU stall warnings. */ #include <linux/posix_acl.h> -#ifndef HAVE_POSIX_ACL_CACHING -#define ACL_NOT_CACHED ((void *)(-1)) -#endif /* HAVE_POSIX_ACL_CACHING */ #if defined(HAVE_POSIX_ACL_RELEASE) && !defined(HAVE_POSIX_ACL_RELEASE_GPL_ONLY) @@ -233,7 +230,6 @@ zpl_posix_acl_release(struct posix_acl *acl) static inline void zpl_set_cached_acl(struct inode *ip, int type, struct posix_acl *newer) { -#ifdef HAVE_POSIX_ACL_CACHING struct posix_acl *older = NULL; spin_lock(&ip->i_lock); @@ -255,7 +251,6 @@ zpl_set_cached_acl(struct inode *ip, int type, struct posix_acl *newer) { spin_unlock(&ip->i_lock); zpl_posix_acl_release(older); -#endif /* HAVE_POSIX_ACL_CACHING */ } static inline void @@ -322,14 +317,6 @@ typedef mode_t zpl_equivmode_t; #endif /* HAVE_POSIX_ACL_EQUIV_MODE_UMODE_T */ #endif /* CONFIG_FS_POSIX_ACL */ -#ifndef HAVE_CURRENT_UMASK -static inline int -current_umask(void) -{ - return (current->fs->umask); -} -#endif /* HAVE_CURRENT_UMASK */ - /* * 2.6.38 API change, * The is_owner_or_cap() function was renamed to inode_owner_or_capable(). diff --git a/module/zfs/zpl_xattr.c b/module/zfs/zpl_xattr.c index 1a15d4d61..abe150267 100644 --- a/module/zfs/zpl_xattr.c +++ b/module/zfs/zpl_xattr.c @@ -1017,11 +1017,9 @@ zpl_get_acl(struct inode *ip, int type) char *name; int size; -#ifdef HAVE_POSIX_ACL_CACHING acl = get_cached_acl(ip, type); if (acl != ACL_NOT_CACHED) return (acl); -#endif /* HAVE_POSIX_ACL_CACHING */ switch (type) { case ACL_TYPE_ACCESS: |