LU-6179 llite: Implement ladvise lockahead

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

diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4
index 12dbd63..b748d49 100644 (file)
--- a/config/lustre-build-ldiskfs.m4
+++ b/config/lustre-build-ldiskfs.m4
@@ -13,9 +13,11 @@ esac
 AS_IF([test -z "$LDISKFS_SERIES"], [
 AS_IF([test x$RHEL_KERNEL = xyes], [
        case $RHEL_RELEASE_NO in
+       74)     LDISKFS_SERIES="3.10-rhel7.4.series"    ;;
        73)     LDISKFS_SERIES="3.10-rhel7.3.series"    ;;
        72)     LDISKFS_SERIES="3.10-rhel7.2.series"    ;;
        71)     LDISKFS_SERIES="3.10-rhel7.series"      ;;
+       69)     LDISKFS_SERIES="2.6-rhel6.9.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"     ;;
@@ -34,7 +36,9 @@ AS_IF([test x$RHEL_KERNEL = xyes], [
                case $PLEV in
                2) LDISKFS_SERIES="3.0-sles11.series"
                        ;;
-               3|4) LDISKFS_SERIES="3.0-sles11sp3.series"
+               3) LDISKFS_SERIES="3.0-sles11sp3.series"
+                       ;;
+               4) LDISKFS_SERIES="3.0-sles11sp4.series"
                        ;;
                esac
        ])],[LDISKFS_SERIES="3.12-sles12.series"],[
@@ -318,11 +322,21 @@ 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%.*}* \
+       # that extracted to $LINUX
+       linux_src=$(ls -1d $linux_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"],
-               [EXT4_SRC_DIR=""])
+       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%.*}* \
+                       2>/dev/null | tail -1)
+               AS_IF([test -e "$linux_src/fs/ext4/super.c"], [
+                       EXT4_SRC_DIR="$linux_src/fs/ext4"
+               ], [
+                       EXT4_SRC_DIR=""
+               ])
+       ])
 ])
 AC_MSG_RESULT([$EXT4_SRC_DIR])
 AC_SUBST(EXT4_SRC_DIR)