LU-8364 ldiskfs: fixes for failover mode.

[fs/lustre-release.git] / config / lustre-build-ldiskfs.m4

diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4
index 3115a97..7de591f 100644 (file)
--- a/config/lustre-build-ldiskfs.m4
+++ b/config/lustre-build-ldiskfs.m4
@@ -13,8 +13,10 @@ esac
 AS_IF([test -z "$LDISKFS_SERIES"], [
 AS_IF([test x$RHEL_KERNEL = xyes], [
        case $RHEL_RELEASE_NO in
+       73)     LDISKFS_SERIES="3.10-rhel7.3.series"    ;;
        72)     LDISKFS_SERIES="3.10-rhel7.2.series"    ;;
        71)     LDISKFS_SERIES="3.10-rhel7.series"      ;;
+       68)     LDISKFS_SERIES="2.6-rhel6.8.series"     ;;
        67)     LDISKFS_SERIES="2.6-rhel6.7.series"     ;;
        66)     LDISKFS_SERIES="2.6-rhel6.6.series"     ;;
        65)     LDISKFS_SERIES="2.6-rhel6.5.series"     ;;
@@ -46,8 +48,8 @@ AS_IF([test x$RHEL_KERNEL = xyes], [
 ])
 ])
 AS_IF([test -z "$LDISKFS_SERIES"],
-       [AC_MSG_WARN([Unknown kernel version $LDISKFS_VERSIONRELEASE])])
-AC_MSG_RESULT([$LDISKFS_SERIES])
+       [AC_MSG_RESULT([failed to identify series])],
+       [AC_MSG_RESULT([$LDISKFS_SERIES])])
 AC_SUBST(LDISKFS_SERIES)
 ]) # LDISKFS_LINUX_SERIES
 
@@ -124,6 +126,23 @@ ext4_map_blocks, [
 ])
 
 #
+# LB_EXT4_BREAD_4ARGS
+#
+# 3.18 ext4_bread has 4 arguments
+#
+AC_DEFUN([LB_EXT4_BREAD_4ARGS], [
+LB_CHECK_COMPILE([if ext4_bread takes 4 arguments],
+ext4_bread, [
+       #include <linux/fs.h>
+       #include "$EXT4_SRC_DIR/ext4.h"
+],[
+       ext4_bread(NULL, NULL, 0, 0);
+],[
+       AC_DEFINE(HAVE_EXT4_BREAD_4ARGS, 1, [ext4_bread takes 4 arguments])
+])
+]) # LB_EXT4_BREAD_4ARGS
+
+#
 # LDISKFS_AC_PATCH_PROGRAM
 #
 # Determine which program should be used to apply the patches to
@@ -202,6 +221,7 @@ AS_IF([test x$enable_ldiskfs != xno],[
        LB_EXT_PBLOCK
        LB_EXT4_JOURNAL_START_3ARGS
        LB_LDISKFS_MAP_BLOCKS
+       LB_EXT4_BREAD_4ARGS
        AC_DEFINE(CONFIG_LDISKFS_FS_POSIX_ACL, 1, [posix acls for ldiskfs])
        AC_DEFINE(CONFIG_LDISKFS_FS_SECURITY, 1, [fs security for ldiskfs])
        AC_DEFINE(CONFIG_LDISKFS_FS_XATTR, 1, [extened attributes for ldiskfs])
@@ -273,7 +293,7 @@ AS_IF([test -e "$linux_src/fs/ext4/super.c"], [
        EXT4_SRC_DIR="$linux_src/fs/ext4"
 ], [
        # Kernel ext source provided by kernel-debuginfo-common package
-       linux_src=$(ls -1d /usr/src/debug/*/linux-$LINUXRELEASE \
+       linux_src=$(ls -1d /usr/src/debug/*/linux-${LINUXRELEASE%.*}* \
                2>/dev/null | tail -1)
        AS_IF([test -e "$linux_src/fs/ext4/super.c"],
                [EXT4_SRC_DIR="$linux_src/fs/ext4"],