d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Linux 3.4 compat, __clear_close_on_exec replaces FD_CLR

Browse Source 
torvalds/linux@1dce27c5aa 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
This commit is contained in:
Richard Yao 2012-06-06 16:51:53 +00:00 committed by Brian Behlendorf
parent eaac9ba510
commit e0093fea58
5 changed files with 167 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
config/spl-build.m4
View File

@ -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

136
configure vendored
View File

@ -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; }

4
include/linux/file_compat.h
View File

@ -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 */

2
module/splat/splat-vnode.c
View File

@ -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)

3
spl_config.h.in
View File

@ -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