Linux 5.2 compat: Remove config/kernel-set-fs-pwd.m4

This failed on 5.2-rc1 with "error: unknown" message, for set_fs_pwd()
not being visible in both const and non-const tests.

This is caused by torvalds/linux@83da1bed86. It's configurable,
but we would want to be able to compile with default kbuild setting.

set_fs_pwd() has never been exported with exception of some distro
kernels, and set_fs_pwd() wasn't used in ZoL to begin with. The test
result was used for a spl function vn_set_fs_pwd().

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: loli10K <ezomori.nozomu@gmail.com>
Signed-off-by: Tomohiro Kusumi <kusumi.tomohiro@osnexus.com>
Closes #8777

diff --git a/config/kernel-set-fs-pwd.m4 b/config/kernel-set-fs-pwd.m4
deleted file mode 100644 (file)
index d5565b4..0000000
--- a/config/kernel-set-fs-pwd.m4
+++ /dev/null
@@ -1,39 +0,0 @@
-dnl #
-dnl # 3.9 API change
-dnl # set_fs_pwd takes const struct path *
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SET_FS_PWD_WITH_CONST],
-       tmp_flags="$EXTRA_KCFLAGS"
-       EXTRA_KCFLAGS="-Werror"
-       [AC_MSG_CHECKING([whether set_fs_pwd() requires const struct path *])
-       ZFS_LINUX_TRY_COMPILE([
-               #include <linux/spinlock.h>
-               #include <linux/fs_struct.h>
-               #include <linux/path.h>
-               void (*const set_fs_pwd_func)
-                       (struct fs_struct *, const struct path *)
-                       = set_fs_pwd;
-       ],[
-               return 0;
-       ],[
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_SET_FS_PWD_WITH_CONST, 1,
-                       [set_fs_pwd() needs const path *])
-       ],[
-               ZFS_LINUX_TRY_COMPILE([
-                       #include <linux/spinlock.h>
-                       #include <linux/fs_struct.h>
-                       #include <linux/path.h>
-                       void (*const set_fs_pwd_func)
-                               (struct fs_struct *, struct path *)
-                               = set_fs_pwd;
-               ],[
-                       return 0;
-               ],[
-                       AC_MSG_RESULT(no)
-               ],[
-                       AC_MSG_ERROR(unknown)
-               ])
-       ])
-       EXTRA_KCFLAGS="$tmp_flags"
-])

diff --git a/config/kernel.m4 b/config/kernel.m4
index eed712ca81a6997aaf4a6af45a67fe9fbcba81bf..78d3a90a7f60a3c643f32ac361e5607954a0d086 100644 (file)
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -11,7 +11,6 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
        ZFS_AC_KERNEL_CONFIG
        ZFS_AC_KERNEL_CTL_NAME
        ZFS_AC_KERNEL_PDE_DATA
-       ZFS_AC_KERNEL_SET_FS_PWD_WITH_CONST
        ZFS_AC_KERNEL_2ARGS_VFS_FSYNC
        ZFS_AC_KERNEL_FS_STRUCT_SPINLOCK
        ZFS_AC_KERNEL_KUIDGID_T

diff --git a/module/spl/spl-vnode.c b/module/spl/spl-vnode.c
index ef5f605404449fc18e9600cc2acb126a580f0d88..11b5e4e5a2f26f17c01233e0de16164a88c8c17c 100644 (file)
--- a/module/spl/spl-vnode.c
+++ b/module/spl/spl-vnode.c
@@ -643,11 +643,7 @@ EXPORT_SYMBOL(areleasef);
 
 
 static void
-#ifdef HAVE_SET_FS_PWD_WITH_CONST
-vn_set_fs_pwd(struct fs_struct *fs, const struct path *path)
-#else
 vn_set_fs_pwd(struct fs_struct *fs, struct path *path)
-#endif /* HAVE_SET_FS_PWD_WITH_CONST */
 {
        struct path old_pwd;