config: remove HAVE_VFSMOUNT_IOPS_GETATTR

Sponsored-by: https://despairlabs.com/sponsor/ Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Tony Hutter <[email protected]> Reviewed-by: Tino Reichardt <[email protected]> Signed-off-by: Rob Norris <[email protected]> Closes #16479
openzfs · Sep 18, 2024 · 7a02229 · 7a02229
1 parent df9795f
commit 7a02229
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 36 deletions.
diff --git a/config/kernel-inode-getattr.m4 b/config/kernel-inode-getattr.m4
@@ -57,20 +57,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_GETATTR], [
 			.getattr = test_getattr,
 		};
 	],[])
-
-	ZFS_LINUX_TEST_SRC([inode_operations_getattr_vfsmount], [
-		#include <linux/fs.h>
-
-		static int test_getattr(
-		    struct vfsmount *mnt, struct dentry *d,
-		    struct kstat *k)
-		    { return 0; }
-
-		static const struct inode_operations
-		    iops __attribute__ ((unused)) = {
-			.getattr = test_getattr,
-		};
-	],[])
 ])
 
 AC_DEFUN([ZFS_AC_KERNEL_INODE_GETATTR], [
@@ -105,18 +91,6 @@ AC_DEFUN([ZFS_AC_KERNEL_INODE_GETATTR], [
 					[iops->getattr() takes a path])
 			],[
 				AC_MSG_RESULT(no)
-
-				dnl #
-				dnl # Kernel < 4.11 test
-				dnl #
-				AC_MSG_CHECKING([whether iops->getattr() takes a vfsmount])
-				ZFS_LINUX_TEST_RESULT([inode_operations_getattr_vfsmount], [
-					AC_MSG_RESULT(yes)
-					AC_DEFINE(HAVE_VFSMOUNT_IOPS_GETATTR, 1,
-						[iops->getattr() takes a vfsmount])
-				],[
-					AC_MSG_RESULT(no)
-				])
 			])
 		])
 	])

diff --git a/include/os/linux/kernel/linux/vfs_compat.h b/include/os/linux/kernel/linux/vfs_compat.h
@@ -187,16 +187,7 @@ setattr_prepare(struct dentry *dentry, struct iattr *ia)
  * 4.11 takes struct path *, < 4.11 takes vfsmount *
  */
 
-#ifdef HAVE_VFSMOUNT_IOPS_GETATTR
-#define	ZPL_GETATTR_WRAPPER(func)					\
-static int								\
-func(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)	\
-{									\
-	struct path path = { .mnt = mnt, .dentry = dentry };		\
-	return func##_impl(&path, stat, STATX_BASIC_STATS,		\
-	    AT_STATX_SYNC_AS_STAT);					\
-}
-#elif defined(HAVE_PATH_IOPS_GETATTR)
+#if defined(HAVE_PATH_IOPS_GETATTR)
 #define	ZPL_GETATTR_WRAPPER(func)					\
 static int								\
 func(const struct path *path, struct kstat *stat, u32 request_mask,	\