diff options
| -rw-r--r-- | config/kernel-acl.m4 | 24 | ||||
| -rw-r--r-- | config/kernel.m4 | 1 | ||||
| -rw-r--r-- | include/linux/vfs_compat.h | 12 | ||||
| -rw-r--r-- | module/zfs/zpl_xattr.c | 4 |
4 files changed, 39 insertions, 2 deletions
diff --git a/config/kernel-acl.m4 b/config/kernel-acl.m4 index 6ef80fe5e..d2a1821c5 100644 --- a/config/kernel-acl.m4 +++ b/config/kernel-acl.m4 @@ -98,6 +98,30 @@ AC_DEFUN([ZFS_AC_KERNEL_POSIX_ACL_EQUIV_MODE_WANTS_UMODE_T], [ ]) dnl # +dnl # 4.8 API change, +dnl # The function posix_acl_valid now must be passed a namespace. +dnl # +AC_DEFUN([ZFS_AC_KERNEL_POSIX_ACL_VALID_WITH_NS], [ + AC_MSG_CHECKING([whether posix_acl_valid() wants user namespace]) + ZFS_LINUX_TRY_COMPILE([ + #include <linux/fs.h> + #include <linux/posix_acl.h> + ],[ + struct user_namespace *user_ns = NULL; + const struct posix_acl *acl = NULL; + int error; + + error = posix_acl_valid(user_ns, acl); + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_POSIX_ACL_VALID_WITH_NS, 1, + [posix_acl_valid() wants user namespace]) + ],[ + AC_MSG_RESULT(no) + ]) +]) + +dnl # dnl # 2.6.27 API change, dnl # Check if inode_operations contains the function permission dnl # and expects the nameidata structure to have been removed. diff --git a/config/kernel.m4 b/config/kernel.m4 index 9eec504f8..507e81010 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -43,6 +43,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ ZFS_AC_KERNEL_POSIX_ACL_RELEASE ZFS_AC_KERNEL_POSIX_ACL_CHMOD ZFS_AC_KERNEL_POSIX_ACL_EQUIV_MODE_WANTS_UMODE_T + ZFS_AC_KERNEL_POSIX_ACL_VALID_WITH_NS ZFS_AC_KERNEL_INODE_OPERATIONS_PERMISSION ZFS_AC_KERNEL_INODE_OPERATIONS_PERMISSION_WITH_NAMEIDATA ZFS_AC_KERNEL_INODE_OPERATIONS_CHECK_ACL diff --git a/include/linux/vfs_compat.h b/include/linux/vfs_compat.h index 52c539933..820647d39 100644 --- a/include/linux/vfs_compat.h +++ b/include/linux/vfs_compat.h @@ -316,6 +316,18 @@ typedef umode_t zpl_equivmode_t; #else typedef mode_t zpl_equivmode_t; #endif /* HAVE_POSIX_ACL_EQUIV_MODE_UMODE_T */ + +/* + * 4.8 API change, + * posix_acl_valid() now must be passed a namespace, the namespace from + * from super block associated with the given inode is used for this purpose. + */ +#ifdef HAVE_POSIX_ACL_VALID_WITH_NS +#define zpl_posix_acl_valid(ip, acl) posix_acl_valid(ip->i_sb->s_user_ns, acl) +#else +#define zpl_posix_acl_valid(ip, acl) posix_acl_valid(acl) +#endif + #endif /* CONFIG_FS_POSIX_ACL */ /* diff --git a/module/zfs/zpl_xattr.c b/module/zfs/zpl_xattr.c index 6dab895e0..ab81dd2d0 100644 --- a/module/zfs/zpl_xattr.c +++ b/module/zfs/zpl_xattr.c @@ -1288,7 +1288,7 @@ __zpl_xattr_acl_set_access(struct inode *ip, const char *name, if (IS_ERR(acl)) return (PTR_ERR(acl)); else if (acl) { - error = posix_acl_valid(acl); + error = zpl_posix_acl_valid(ip, acl); if (error) { zpl_posix_acl_release(acl); return (error); @@ -1328,7 +1328,7 @@ __zpl_xattr_acl_set_default(struct inode *ip, const char *name, if (IS_ERR(acl)) return (PTR_ERR(acl)); else if (acl) { - error = posix_acl_valid(acl); + error = zpl_posix_acl_valid(ip, acl); if (error) { zpl_posix_acl_release(acl); return (error); |