config: remove HAVE_INODE_SET_IVERSION

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-iversion.m4 b/config/kernel-inode-set-iversion.m4
deleted file mode 100644 (file)
index dd415de..0000000
--- a/config/kernel-inode-set-iversion.m4
+++ /dev/null
@@ -1,23 +0,0 @@
-dnl #
-dnl # 4.16 API change
-dnl # inode_set_iversion introduced to set i_version
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_SET_IVERSION], [
-       ZFS_LINUX_TEST_SRC([inode_set_iversion], [
-               #include <linux/iversion.h>
-       ],[
-               struct inode inode;
-               inode_set_iversion(&inode, 1);
-       ])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_INODE_SET_IVERSION], [
-       AC_MSG_CHECKING([whether inode_set_iversion() exists])
-       ZFS_LINUX_TEST_RESULT([inode_set_iversion], [
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_INODE_SET_IVERSION, 1,
-                   [inode_set_iversion() exists])
-       ],[
-               AC_MSG_RESULT(no)
-       ])
-])

diff --git a/config/kernel.m4 b/config/kernel.m4
index 80481141a9c4d9f3ff8616609d4cc1de97c5f97c..7752cb2261eb0127b9770ecc55c256f4bfde70b2 100644 (file)
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -67,7 +67,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_IVERSION
        ZFS_AC_KERNEL_SRC_SHOW_OPTIONS
        ZFS_AC_KERNEL_SRC_SHRINKER
        ZFS_AC_KERNEL_SRC_MKDIR
@@ -189,7 +188,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_IVERSION
        ZFS_AC_KERNEL_SHOW_OPTIONS
        ZFS_AC_KERNEL_SHRINKER
        ZFS_AC_KERNEL_MKDIR

diff --git a/include/os/linux/kernel/linux/vfs_compat.h b/include/os/linux/kernel/linux/vfs_compat.h
index 056cd9c825a92b220ecd6c2051b8c17b4afe903e..369829a8f65343c7354582805f9c977df6fe5a15 100644 (file)
--- a/include/os/linux/kernel/linux/vfs_compat.h
+++ b/include/os/linux/kernel/linux/vfs_compat.h
@@ -274,20 +274,6 @@ func(struct mnt_idmap *user_ns, const struct path *path,   \
 #error
 #endif
 
-/*
- * 4.16 API change
- * Added iversion interface for managing inode version field.
- */
-#ifdef HAVE_INODE_SET_IVERSION
-#include <linux/iversion.h>
-#else
-static inline void
-inode_set_iversion(struct inode *ip, u64 val)
-{
-       ip->i_version = val;
-}
-#endif
-
 /*
  * Returns true when called in the context of a 32-bit system call.
  */

diff --git a/module/os/linux/zfs/zpl_super.c b/module/os/linux/zfs/zpl_super.c
index 7635fb5824901278106d67cbeccabde8a0627976..287f5f36f9ddf801c3db0684db32d51f16f8c266 100644 (file)
--- a/module/os/linux/zfs/zpl_super.c
+++ b/module/os/linux/zfs/zpl_super.c
@@ -29,6 +29,7 @@
 #include <sys/zfs_vnops.h>
 #include <sys/zfs_ctldir.h>
 #include <sys/zpl.h>
+#include <linux/iversion.h>
 
 
 static struct inode *