LU-2686 kernel: sock_map_fd() replaced by sock_alloc_file()

[fs/lustre-release.git] / libcfs / autoconf / lustre-libcfs.m4

diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4
index 04f61a6..0f53b9a 100644 (file)
--- a/libcfs/autoconf/lustre-libcfs.m4
+++ b/libcfs/autoconf/lustre-libcfs.m4
@@ -367,7 +367,7 @@ LB_LINUX_TRY_COMPILE([
 ],[
         AC_MSG_RESULT(yes)
         AC_DEFINE(HAVE_SCATTERLIST_SETPAGE, 1,
-                  [struct scatterlist has page member])
+                  [struct scatterlist has no page member])
 ],[
         AC_MSG_RESULT(NO)
 ])
@@ -638,10 +638,10 @@ LB_LINUX_TRY_COMPILE([
 ])
 ])
 
-AC_DEFUN([LIBCFS_HAVE_OOM_H],
-[LB_CHECK_FILE([$LINUX/include/linux/oom.h], [
-        AC_DEFINE(HAVE_LINUX_OOM_H, 1,
-                [kernel has include/oom.h])
+AC_DEFUN([LIBCFS_HAVE_KEYTYPE_H],
+[LB_CHECK_FILE([$LINUX/include/linux/key-type.h], [
+        AC_DEFINE(HAVE_LINUX_KEYTYPE_H, 1,
+                [kernel has include/key-type.h])
 ],[
         AC_MSG_RESULT([no])
 ])
@@ -687,23 +687,6 @@ LB_LINUX_TRY_COMPILE([
 ])
 ])
 
-# 2.6.18 store oom parameters in task struct.
-# 2.6.32 store oom parameters in signal struct
-AC_DEFUN([LIBCFS_OOMADJ_IN_SIG],
-[AC_MSG_CHECKING([kernel store oom parameters in task])
-LB_LINUX_TRY_COMPILE([
-        #include <linux/sched.h>
-],[
-        ((struct signal_struct *)0)->oom_adj = 0;
-],[
-        AC_MSG_RESULT(yes)
-        AC_DEFINE(HAVE_OOMADJ_IN_SIG, 1,
-                  [kernel store a oom parameters in signal struct])
-],[
-        AC_MSG_RESULT(no)
-])
-])
-
 #
 # 2.6.33 no longer has ctl_name & strategy field in struct ctl_table.
 #
@@ -784,6 +767,31 @@ LB_LINUX_TRY_COMPILE([
 ])
 
 #
+# FC18 3.7.2-201 unexport sock_map_fd() change to
+# use sock_alloc_file().
+# upstream commit 56b31d1c9f1e6a3ad92e7bfe252721e05d92b285
+#
+AC_DEFUN([LIBCFS_SOCK_ALLOC_FILE],
+[AC_MSG_CHECKING([sock_alloc_file is exported])
+LB_CHECK_SYMBOL_EXPORT([sock_alloc_file], [net/socket.c],[
+       LB_LINUX_TRY_COMPILE([
+               #include <linux/net.h>
+       ],[
+               sock_alloc_file(NULL, 0, NULL);
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_SOCK_ALLOC_FILE_3ARGS, 1,
+                       [sock_alloc_file takes 3 arguments])
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_SOCK_ALLOC_FILE, 1,
+                       [sock_alloc_file is exported])
+       ])
+],[
+])
+])
+
+#
 # LIBCFS_PROG_LINUX
 #
 # LNet linux kernel checks
@@ -812,6 +820,7 @@ LIBCFS_SCATTERLIST_SETPAGE
 LIBCFS_SCATTERLIST_INITTABLE
 LIBCFS_NETWORK_NAMESPACE
 LIBCFS_FUNC_DUMP_TRACE
+LIBCFS_HAVE_KEYTYPE_H
 # 2.6.26
 LIBCFS_SEM_COUNT
 # 2.6.27
@@ -830,8 +839,6 @@ LIBCFS_HAVE_SET_MEMS_ALLOWED
 # 2.6.32
 LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK
 LC_SHRINKER_WANT_SHRINK_PTR
-LIBCFS_HAVE_OOM_H
-LIBCFS_OOMADJ_IN_SIG
 # 2.6.33
 LIBCFS_SYSCTL_CTLNAME
 # 2.6.34
@@ -840,6 +847,8 @@ LIBCFS_ADD_WAIT_QUEUE_EXCLUSIVE
 LC_SK_SLEEP
 # 2.6.40 fc15
 LC_SHRINK_CONTROL
+# 3.7
+LIBCFS_SOCK_ALLOC_FILE
 ])
 
 #
@@ -944,6 +953,7 @@ AC_COMPILE_IFELSE([
                __u64 *data2 = NULL;
 
                data1 = data2;
+               data2 = data1;
                return 0;
        }
 ],[