Linux 3.4 compat, __clear_close_on_exec replaces FD_CLR

torvalds/linux@1dce27c5aa6770e9d195f2bb7db1db3d4dde5591 introduced
__clear_close_on_exec() as a replacement for FD_CLR. Further commits
appear to have removed FD_CLR from the Linux source tree.  This
causes the following failure:

  error: implicit declaration of function '__FD_CLR'
  [-Werror=implicit-function-declaration]

To correct this we update the code to use the current
__clear_close_on_exec() interface for readability.  Then we introduce
an autotools check to determine if __clear_close_on_exec() is available.
If it isn't then we define some compatibility logic which used the older
FD_CLR() interface.

Signed-off-by: Richard Yao <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #124

diff --git a/config/spl-build.m4 b/config/spl-build.m4
index 6605b826d6be5da740a7d96d5287f86dd922b663..4d02a72ec51a927f122486303b06f6397815c3e1 100644 (file)
--- a/config/spl-build.m4
+++ b/config/spl-build.m4
@@ -44,6 +44,7 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [
        SPL_AC_INIT_UTSNAME
        SPL_AC_FDTABLE_HEADER
        SPL_AC_FILES_FDTABLE
+       SPL_AC_CLEAR_CLOSE_ON_EXEC
        SPL_AC_UACCESS_HEADER
        SPL_AC_KMALLOC_NODE
        SPL_AC_MONOTONIC_CLOCK
@@ -1176,6 +1177,28 @@ AC_DEFUN([SPL_AC_FILES_FDTABLE], [
        ])
 ])
 
+dnl #
+dnl # 3.4.0 API change,
+dnl # check whether '__clear_close_on_exec()' exists
+dnl #
+AC_DEFUN([SPL_AC_CLEAR_CLOSE_ON_EXEC], [
+       AC_MSG_CHECKING([whether __clear_close_on_exec() is available])
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/fdtable.h>
+       ],[
+               struct fdtable *fdt = NULL;
+               int fd = 0;
+
+               __clear_close_on_exec(fd, fdt);
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_CLEAR_CLOSE_ON_EXEC, 1,
+                         [__clear_close_on_exec() is available])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+])
+
 dnl #
 dnl # 2.6.18 API change,
 dnl # added linux/uaccess.h

diff --git a/configure b/configure
index f4a9f139fd2e576c3351c831697982481f6386bb..761fdc1ccce7c67f366ca26a55f1c2711980242a 100755 (executable)
--- a/configure
+++ b/configure
@@ -13506,6 +13506,74 @@ fi
 
 
 
+       { $as_echo "$as_me:$LINENO: checking whether __clear_close_on_exec() is available" >&5
+$as_echo_n "checking whether __clear_close_on_exec() is available... " >&6; }
+
+
+cat confdefs.h - <<_ACEOF >conftest.c
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+               #include <linux/fdtable.h>
+
+int
+main (void)
+{
+
+               struct fdtable *fdt = NULL;
+               int fd = 0;
+
+               __clear_close_on_exec(fd, fdt);
+
+  ;
+  return 0;
+}
+
+_ACEOF
+
+
+       rm -Rf build && mkdir -p build
+       echo "obj-m := conftest.o" >build/Makefile
+       if { ac_try='cp conftest.c build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+               { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CLEAR_CLOSE_ON_EXEC 1
+_ACEOF
+
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+               { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+
+
+fi
+
+       rm -Rf build
+
+
+
+
        { $as_echo "$as_me:$LINENO: checking whether header linux/uaccess.h exists" >&5
 $as_echo_n "checking whether header linux/uaccess.h exists... " >&6; }
 
@@ -17936,6 +18004,74 @@ fi
 
 
 
+       { $as_echo "$as_me:$LINENO: checking whether __clear_close_on_exec() is available" >&5
+$as_echo_n "checking whether __clear_close_on_exec() is available... " >&6; }
+
+
+cat confdefs.h - <<_ACEOF >conftest.c
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+               #include <linux/fdtable.h>
+
+int
+main (void)
+{
+
+               struct fdtable *fdt = NULL;
+               int fd = 0;
+
+               __clear_close_on_exec(fd, fdt);
+
+  ;
+  return 0;
+}
+
+_ACEOF
+
+
+       rm -Rf build && mkdir -p build
+       echo "obj-m := conftest.o" >build/Makefile
+       if { ac_try='cp conftest.c build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+               { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CLEAR_CLOSE_ON_EXEC 1
+_ACEOF
+
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+               { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+
+
+fi
+
+       rm -Rf build
+
+
+
+
        { $as_echo "$as_me:$LINENO: checking whether header linux/uaccess.h exists" >&5
 $as_echo_n "checking whether header linux/uaccess.h exists... " >&6; }
 

diff --git a/include/linux/file_compat.h b/include/linux/file_compat.h
index 5c7833d4a6e1b956a4bb6a2bb2368c62e2de4839..2b5b7d2257913996e816d72287d64d1d60a0da20 100644 (file)
--- a/include/linux/file_compat.h
+++ b/include/linux/file_compat.h
@@ -83,5 +83,9 @@ extern kern_path_parent_t kern_path_parent_fn;
 # define spl_kern_path_parent(path, nd)        path_lookup(path, LOOKUP_PARENT, nd)
 #endif /* HAVE_KERN_PATH_PARENT_HEADER */
 
+#ifndef HAVE_CLEAR_CLOSE_ON_EXEC
+#define __clear_close_on_exec(fd, fdt) FD_CLR(fd, fdt->close_on_exec)
+#endif
+
 #endif /* SPL_FILE_COMPAT_H */
 

diff --git a/module/splat/splat-vnode.c b/module/splat/splat-vnode.c
index 0cd28a690e34c4f879219d06a1b9cfd20c747cfb..f5f010c9f828b6d3dd9a4df7c6adeb0ebb177287 100644 (file)
--- a/module/splat/splat-vnode.c
+++ b/module/splat/splat-vnode.c
@@ -414,7 +414,7 @@ fd_uninstall(int fd)
                 goto out_unlock;
 
         rcu_assign_pointer(fdt->fd[fd], NULL);
-        FD_CLR(fd, fdt->close_on_exec);
+       __clear_close_on_exec(fd, fdt);
 #else
         spin_lock(&files->file_lock);
         if (fd >= files->max_fds)

diff --git a/spl_config.h.in b/spl_config.h.in
index 05dcdc5045202bfcd399ed6a02b5d5dadfe55e07..92c11df26b7c3e1535ff6ff60cd1bcb4f86fdcce 100644 (file)
--- a/spl_config.h.in
+++ b/spl_config.h.in
@@ -60,6 +60,9 @@
 /* class_device_create() is available */
 #undef HAVE_CLASS_DEVICE_CREATE
 
+/* __clear_close_on_exec() is available */
+#undef HAVE_CLEAR_CLOSE_ON_EXEC
+
 /* struct cred exists */
 #undef HAVE_CRED_STRUCT