LU-1714 lnet: Properly initialize sg_magic value

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

diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4
index 8ff37b5..389e4de 100644 (file)
--- a/libcfs/autoconf/lustre-libcfs.m4
+++ b/libcfs/autoconf/lustre-libcfs.m4
@@ -101,13 +101,10 @@ AC_DEFUN([LIBCFS_DIGEST_SETKEY_FLAGS],
 LB_LINUX_TRY_COMPILE([
        #include <linux/err.h>
        #include <linux/crypto.h>
-
-       static int foo(struct crypto_tfm *tfm, const u8 *key, unsigned int l, u32* f)
-       {
-               return 1;
-       }
 ],[
-       struct digest_alg alg = {.dia_setkey=foo};
+       struct digest_alg alg;
+
+       alg.dia_setkey(NULL, NULL, 0, NULL);
 ],[
        AC_MSG_RESULT([yes])
        AC_DEFINE(HAVE_DIGEST_SETKEY_FLAGS, 1, [kernel dia_setkey takes 4 args])
@@ -116,7 +113,6 @@ LB_LINUX_TRY_COMPILE([
 ])
 ])
 
-
 # 2.6.19 API changes
 # kmem_cache_destroy(cachep) return void instead of
 # int
@@ -350,7 +346,24 @@ LB_LINUX_TRY_COMPILE([
 ])
 ])
 
-# 2.6.24 
+# 2.6.24-rc1 sg_init_table
+AC_DEFUN([LIBCFS_SCATTERLIST_INITTABLE],
+[AC_MSG_CHECKING([for sg_init_table])
+LB_LINUX_TRY_COMPILE([
+       #include <asm/types.h>
+       #include <linux/scatterlist.h>
+],[
+       sg_init_table(NULL,0);
+],[
+       AC_MSG_RESULT(yes)
+       AC_DEFINE(HAVE_SCATTERLIST_INITTABLE, 1,
+                 [scatterlist has sg_init_table])
+],[
+       AC_MSG_RESULT(NO)
+])
+])
+
+# 2.6.24
 AC_DEFUN([LIBCFS_NETWORK_NAMESPACE],
 [AC_MSG_CHECKING([for network stack has namespaces])
 LB_LINUX_TRY_COMPILE([
@@ -769,6 +782,7 @@ LC_REGISTER_SHRINKER
 # 2.6.24
 LIBCFS_SYSCTL_UNNUMBERED
 LIBCFS_SCATTERLIST_SETPAGE
+LIBCFS_SCATTERLIST_INITTABLE
 LIBCFS_NETWORK_NAMESPACE
 LIBCFS_FUNC_DUMP_TRACE
 # 2.6.26
@@ -839,6 +853,12 @@ AC_CHECK_TYPE([spinlock_t],
 # lnet/utils/wirecheck.c
 AC_CHECK_FUNCS([strnlen])
 
+# lnet/libcfs/user-prim.c, missing for RHEL5 and earlier userspace
+AC_CHECK_FUNCS([strlcpy])
+
+# libcfs/libcfs/user-prim.c, missing for RHEL5 and earlier userspace
+AC_CHECK_FUNCS([strlcat])
+
 AC_CHECK_TYPE([umode_t],
        [AC_DEFINE(HAVE_UMODE_T, 1, [umode_t is defined])],
        [],