config: remove HAVE_FILE_INODE

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-file-inode.m4 b/config/kernel-file-inode.m4
deleted file mode 100644 (file)
index 00a3621..0000000
--- a/config/kernel-file-inode.m4
+++ /dev/null
@@ -1,23 +0,0 @@
-dnl #
-dnl # 3.19 API change
-dnl # struct access f->f_dentry->d_inode was replaced by accessor function
-dnl # file_inode(f)
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_FILE_INODE], [
-       ZFS_LINUX_TEST_SRC([file_inode], [
-               #include <linux/fs.h>
-       ],[
-               struct file *f = NULL;
-               file_inode(f);
-       ])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_FILE_INODE], [
-       AC_MSG_CHECKING([whether file_inode() is available])
-       ZFS_LINUX_TEST_RESULT([file_inode], [
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_FILE_INODE, 1, [file_inode() is available])
-       ],[
-               AC_MSG_RESULT(no)
-       ])
-])

diff --git a/config/kernel.m4 b/config/kernel.m4
index cd91a220ce8947708a3e48b8133da57ddd515e08..0bda98d4c09fd5dabc3d9933aacc2b5df3e6d6c1 100644 (file)
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -74,7 +74,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
        ZFS_AC_KERNEL_SRC_INODE_SET_FLAGS
        ZFS_AC_KERNEL_SRC_INODE_SET_IVERSION
        ZFS_AC_KERNEL_SRC_SHOW_OPTIONS
-       ZFS_AC_KERNEL_SRC_FILE_INODE
        ZFS_AC_KERNEL_SRC_FILEMAP
        ZFS_AC_KERNEL_SRC_FSYNC
        ZFS_AC_KERNEL_SRC_AIO_FSYNC
@@ -221,7 +220,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
        ZFS_AC_KERNEL_INODE_SET_FLAGS
        ZFS_AC_KERNEL_INODE_SET_IVERSION
        ZFS_AC_KERNEL_SHOW_OPTIONS
-       ZFS_AC_KERNEL_FILE_INODE
        ZFS_AC_KERNEL_FILEMAP
        ZFS_AC_KERNEL_FSYNC
        ZFS_AC_KERNEL_AIO_FSYNC

diff --git a/include/os/linux/kernel/linux/vfs_compat.h b/include/os/linux/kernel/linux/vfs_compat.h
index eb4ce8880f0f194420ff88a0f242be195f442f36..5e7874c5b19b12ffeff42c7a2a2e34c456d32ee0 100644 (file)
--- a/include/os/linux/kernel/linux/vfs_compat.h
+++ b/include/os/linux/kernel/linux/vfs_compat.h
@@ -260,18 +260,6 @@ zpl_forget_cached_acl(struct inode *ip, int type)
 
 #endif /* CONFIG_FS_POSIX_ACL */
 
-/*
- * 3.19 API change
- * struct access f->f_dentry->d_inode was replaced by accessor function
- * file_inode(f)
- */
-#ifndef HAVE_FILE_INODE
-static inline struct inode *file_inode(const struct file *f)
-{
-       return (f->f_dentry->d_inode);
-}
-#endif /* HAVE_FILE_INODE */
-
 static inline uid_t zfs_uid_read_impl(struct inode *ip)
 {
        return (from_kuid(kcred->user_ns, ip->i_uid));