config: remove HAVE_INODE_SET_FLAGS

Sponsored-by: https://despairlabs.com/sponsor/
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Tino Reichardt <milky-zfs@mcmilk.de>
Signed-off-by: Rob Norris <robn@despairlabs.com>
Closes #16479

diff --git a/config/kernel-inode-set-flags.m4 b/config/kernel-inode-set-flags.m4
deleted file mode 100644 (file)
index 133f666..0000000
--- a/config/kernel-inode-set-flags.m4
+++ /dev/null
@@ -1,22 +0,0 @@
-dnl #
-dnl # 3.15 API change
-dnl # inode_set_flags introduced to set i_flags
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_SET_FLAGS], [
-       ZFS_LINUX_TEST_SRC([inode_set_flags], [
-               #include <linux/fs.h>
-       ],[
-               struct inode inode;
-               inode_set_flags(&inode, S_IMMUTABLE, S_IMMUTABLE);
-       ])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_INODE_SET_FLAGS], [
-       AC_MSG_CHECKING([whether inode_set_flags() exists])
-       ZFS_LINUX_TEST_RESULT([inode_set_flags], [
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_INODE_SET_FLAGS, 1, [inode_set_flags() exists])
-       ],[
-               AC_MSG_RESULT(no)
-       ])
-])

diff --git a/config/kernel.m4 b/config/kernel.m4
index f9c98c8182ef7a922c35b1d424931654af67f1b2..c9d734bec8bf33761a59e62aa7ad592d561a9f8b 100644 (file)
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -71,7 +71,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
        ZFS_AC_KERNEL_SRC_ACL
        ZFS_AC_KERNEL_SRC_INODE_SETATTR
        ZFS_AC_KERNEL_SRC_INODE_GETATTR
-       ZFS_AC_KERNEL_SRC_INODE_SET_FLAGS
        ZFS_AC_KERNEL_SRC_INODE_SET_IVERSION
        ZFS_AC_KERNEL_SRC_SHOW_OPTIONS
        ZFS_AC_KERNEL_SRC_FILEMAP
@@ -215,7 +214,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
        ZFS_AC_KERNEL_ACL
        ZFS_AC_KERNEL_INODE_SETATTR
        ZFS_AC_KERNEL_INODE_GETATTR
-       ZFS_AC_KERNEL_INODE_SET_FLAGS
        ZFS_AC_KERNEL_INODE_SET_IVERSION
        ZFS_AC_KERNEL_SHOW_OPTIONS
        ZFS_AC_KERNEL_FILEMAP

diff --git a/module/os/linux/zfs/zfs_znode.c b/module/os/linux/zfs/zfs_znode.c
index 265153e011e79929a6acaa17f25709533a5964e7..24aee0b88d44d8f034ac95a42e6862e2b55e8b6b 100644 (file)
--- a/module/os/linux/zfs/zfs_znode.c
+++ b/module/os/linux/zfs/zfs_znode.c
@@ -476,7 +476,6 @@ zfs_set_inode_flags(znode_t *zp, struct inode *ip)
         * Linux and Solaris have different sets of file attributes, so we
         * restrict this conversion to the intersection of the two.
         */
-#ifdef HAVE_INODE_SET_FLAGS
        unsigned int flags = 0;
        if (zp->z_pflags & ZFS_IMMUTABLE)
                flags |= S_IMMUTABLE;
@@ -484,17 +483,6 @@ zfs_set_inode_flags(znode_t *zp, struct inode *ip)
                flags |= S_APPEND;
 
        inode_set_flags(ip, flags, S_IMMUTABLE|S_APPEND);
-#else
-       if (zp->z_pflags & ZFS_IMMUTABLE)
-               ip->i_flags |= S_IMMUTABLE;
-       else
-               ip->i_flags &= ~S_IMMUTABLE;
-
-       if (zp->z_pflags & ZFS_APPENDONLY)
-               ip->i_flags |= S_APPEND;
-       else
-               ip->i_flags &= ~S_APPEND;
-#endif
 }
 
 /*