LU-5322 libcfs: handle vfs_rename change in 3.15+ kernels

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

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 970593c..0891fd4 100644 (file)
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -867,6 +867,22 @@ LB_CHECK_EXPORT([generic_file_llseek_size], [fs/read_write.c],
 ]) # LC_FILE_LLSEEK_SIZE
 
 #
+# LC_RADIX_EXCEPTION_ENTRY
+# 3.1 adds radix_tree_exception_entry.
+#
+AC_DEFUN([LC_RADIX_EXCEPTION_ENTRY], [
+LB_CHECK_COMPILE([radix_tree_exceptional_entry exist],
+radix_tree_exceptional_entry, [
+       #include <linux/radix-tree.h>
+],[
+       radix_tree_exceptional_entry(NULL);
+],[
+       AC_DEFINE(HAVE_RADIX_EXCEPTION_ENTRY, 1,
+               [radix_tree_exceptional_entry exist])
+])
+]) # LC_RADIX_EXCEPTION_ENTRY
+
+#
 # LC_HAVE_VOID_MAKE_REQUEST_FN
 #
 # 3.2 request_queue.make_request_fn defined as function returns with void
@@ -1403,7 +1419,7 @@ kiocb_ki_left, [
 #
 # LC_VFS_RENAME_5ARGS
 #
-# 3.13 has vfs_renane with 5 args
+# 3.13 has vfs_rename with 5 args
 #
 AC_DEFUN([LC_VFS_RENAME_5ARGS], [
 LB_CHECK_COMPILE([if Linux kernel has 'vfs_rename' with 5 args],
@@ -1420,7 +1436,7 @@ vfs_rename_5args, [
 #
 # LC_VFS_UNLINK_3ARGS
 #
-# 3.13 has vfs_renane with 3 args
+# 3.13 has vfs_unlink with 3 args
 #
 AC_DEFUN([LC_VFS_UNLINK_3ARGS], [
 LB_CHECK_COMPILE([if Linux kernel has 'vfs_unlink' with 3 args],
@@ -1435,6 +1451,42 @@ vfs_unlink_3args, [
 ]) # LC_VFS_UNLINK_3ARGS
 
 #
+# LC_HAVE_BVEC_ITER
+#
+# 3.14 move some of its data in struct bio into the new
+# struct bvec_iter
+#
+AC_DEFUN([LC_HAVE_BVEC_ITER], [
+LB_CHECK_COMPILE([if Linux kernel has struct bvec_iter],
+have_bvec_iter, [
+       #include <linux/bio.h>
+],[
+       struct bvec_iter iter;
+       iter.bi_bvec_done = 0;
+], [
+       AC_DEFINE(HAVE_BVEC_ITER, 1,
+               [kernel has struct bvec_iter])
+])
+]) # LC_HAVE_BVEC_ITER
+
+#
+# LC_VFS_RENAME_6ARGS
+#
+# 3.15 has vfs_rename with 6 args
+#
+AC_DEFUN([LC_VFS_RENAME_6ARGS], [
+LB_CHECK_COMPILE([if Linux kernel has 'vfs_rename' with 6 args],
+vfs_rename_6args, [
+       #include <linux/fs.h>
+],[
+       vfs_rename(NULL, NULL, NULL, NULL, NULL, NULL);
+], [
+       AC_DEFINE(HAVE_VFS_RENAME_6ARGS, 1,
+               [kernel has vfs_rename with 6 args])
+])
+]) # LC_VFS_RENAME_6ARGS
+
+#
 # LC_PROG_LINUX
 #
 # Lustre linux kernel checks
@@ -1497,6 +1549,7 @@ AC_DEFUN([LC_PROG_LINUX], [
        LC_IOP_GET_ACL
        LC_FILE_LLSEEK_SIZE
        LC_INODE_PERMISION_2ARGS
+       LC_RADIX_EXCEPTION_ENTRY
 
        # 3.2
        LC_HAVE_VOID_MAKE_REQUEST_FN
@@ -1551,6 +1604,12 @@ AC_DEFUN([LC_PROG_LINUX], [
        LC_VFS_RENAME_5ARGS
        LC_VFS_UNLINK_3ARGS
 
+       # 3.14
+       LC_HAVE_BVEC_ITER
+
+       # 3.15
+       LC_VFS_RENAME_6ARGS
+
        #
        AS_IF([test "x$enable_server" != xno], [
                LC_FUNC_DEV_SET_RDONLY
@@ -1575,6 +1634,49 @@ AC_MSG_RESULT([$enable_client])
 ]) # LC_CONFIG_CLIENT
 
 #
+# --enable-mpitests
+#
+AC_DEFUN([LB_CONFIG_MPITESTS], [
+AC_ARG_ENABLE([mpitests],
+       AC_HELP_STRING([--enable-mpitests=<yes|no|mpicc wrapper>],
+                      [include mpi tests]), [
+               enable_mpitests="yes"
+               case $enableval in
+               yes)
+                       MPICC_WRAPPER="mpicc"
+                       ;;
+               no)
+                       enable_mpitests="no"
+                       ;;
+               *)
+                       MPICC_WRAPPER=$enableval
+                       ;;
+               esac
+       ], [
+               enable_mpitests="yes"
+               MPICC_WRAPPER="mpicc"
+       ])
+
+       if test "x$enable_mpitests" != "xno"; then
+               oldcc=$CC
+               CC=$MPICC_WRAPPER
+               AC_CACHE_CHECK([whether mpitests can be built],
+               lb_cv_mpi_tests, [AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+                       #include <mpi.h>
+                       int main(void) {
+                               int flag;
+                               MPI_Initialized(&flag);
+                               return 0;
+                       }
+               ])], [lb_cv_mpi_tests="yes"], [lb_cv_mpi_tests="no"
+                       enable_mpitests=$lb_cv_mpi_tests])
+               ])
+               CC=$oldcc
+       fi
+       AC_SUBST(MPICC_WRAPPER)
+]) # LB_CONFIG_MPITESTS
+
+#
 # LC_CONFIG_QUOTA
 #
 # whether to enable quota support global control
@@ -1737,26 +1839,6 @@ AC_CHECK_HEADERS([linux/random.h], [], [],
 # utils/llverfs.c
 AC_CHECK_HEADERS([ext2fs/ext2fs.h])
 
-# check for -lz support
-ZLIB=""
-AC_CHECK_LIB([z], [adler32],
-       [AC_CHECK_HEADERS([zlib.h], [
-               ZLIB="-lz"
-               AC_DEFINE([HAVE_ADLER], 1,
-                       [support alder32 checksum type])
-       ], [
-               AC_MSG_WARN([
-
-No zlib-devel package found, unable to use adler32 checksum
-])
-])], [
-       AC_MSG_WARN([
-
-No zlib package found, unable to use adler32 checksum
-])
-])
-AC_SUBST(ZLIB)
-
 SELINUX=""
 AC_CHECK_LIB([selinux], [is_selinux_enabled],
        [AC_CHECK_HEADERS([selinux.h],
@@ -1864,6 +1946,7 @@ lustre/include/lustre_ver.h
 lustre/include/linux/Makefile
 lustre/include/darwin/Makefile
 lustre/include/lustre/Makefile
+lustre/kernel_patches/targets/3.10-rhel7.target
 lustre/kernel_patches/targets/2.6-rhel6.target
 lustre/kernel_patches/targets/2.6-rhel5.target
 lustre/kernel_patches/targets/2.6-sles11.target