X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=config%2Flustre-build-ldiskfs.m4;h=6358dbf2fbd5f64d3905353d3bd9d0a04e3ed574;hp=63b4e7b00daded0b30d0cf4f727cf1b61812cdeb;hb=b0209c2d4d771eb1c728549483244a63e11a818e;hpb=1989badcd5d21f04074e7b10e494498942f4f97e

diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4
index 63b4e7b..6358dbf 100644
--- a/config/lustre-build-ldiskfs.m4
+++ b/config/lustre-build-ldiskfs.m4
@@ -15,50 +15,52 @@ AS_IF([test x$RHEL_KERNEL = xyes], [
 	case $RHEL_RELEASE_NO in
 	81)     LDISKFS_SERIES="4.18-rhel8.1.series"    ;;
 	80)     LDISKFS_SERIES="4.18-rhel8.series"      ;;
+	78)	LDISKFS_SERIES="3.10-rhel7.8.series"	;;
 	77)	LDISKFS_SERIES="3.10-rhel7.7.series"	;;
 	76)	LDISKFS_SERIES="3.10-rhel7.6.series"	;;
-	75)	LDISKFS_SERIES="3.10-rhel7.5.series"	;;
-	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"	;;
-	65)	LDISKFS_SERIES="2.6-rhel6.5.series"	;;
-	64)	LDISKFS_SERIES="2.6-rhel6.4.series"	;;
-	6[0-3])	LDISKFS_SERIES="2.6-rhel6.series"	;;
 	esac
 ], [test x$SUSE_KERNEL = xyes], [
+	AS_VERSION_COMPARE([$LINUXRELEASE],[5.3.18],[
+	AS_VERSION_COMPARE([$LINUXRELEASE],[4.12.14],[
 	AS_VERSION_COMPARE([$LINUXRELEASE],[4.4.82],[
 	AS_VERSION_COMPARE([$LINUXRELEASE],[4.4.0],[
-	AS_VERSION_COMPARE([$LINUXRELEASE],[3.12.0],[
-	AS_VERSION_COMPARE([$LINUXRELEASE],[3.0.0],[
-	AS_VERSION_COMPARE([$LINUXRELEASE],[2.6.32], [],
-	[LDISKFS_SERIES="2.6-sles11.series"],[LDISKFS_SERIES="2.6-sles11.series"])],
-	[LDISKFS_SERIES="3.0-sles11.series"],[
+	AS_VERSION_COMPARE([$LINUXRELEASE],[3.12.0],[],
+	[LDISKFS_SERIES="3.12-sles12.series"],[
 		PLEV=$(grep PATCHLEVEL /etc/SuSE-release | sed -e 's/.*= *//')
-		case $PLEV in
-		2) LDISKFS_SERIES="3.0-sles11.series"
-			;;
-		3) LDISKFS_SERIES="3.0-sles11sp3.series"
-			;;
-		4) LDISKFS_SERIES="3.0-sles11sp4.series"
-			;;
-		esac
-	])],[LDISKFS_SERIES="3.12-sles12.series"],[
-		PLEV=$(grep PATCHLEVEL /etc/SuSE-release | sed -e 's/.*= *//')
-		case $PLEV in
+		case $PLEV in # (
 		1) LDISKFS_SERIES="3.12-sles12sp1.series"
-			;;
+			;; # (
 		*) LDISKFS_SERIES="3.12-sles12.series"
 			;;
 		esac
 	])],[LDISKFS_SERIES="4.4-sles12sp2.series"],
 	    [LDISKFS_SERIES="4.4-sles12sp2.series"]
 	)], [LDISKFS_SERIES="4.4-sles12sp3.series"],
-            [LDISKFS_SERIES="4.4-sles12sp3.series"])
+	    [LDISKFS_SERIES="4.4-sles12sp3.series"]
+	)], [], [
+		suse_conf=$LINUX_OBJ/include/generated/uapi/linux/suse_version.h
+		suse_vers=$(awk '[$]2 == "SUSE_VERSION" {print [$]3 }' $suse_conf)
+		suse_patchlevel=$(awk '[$]2 == "SUSE_PATCHLEVEL" {print [$]3 }' $suse_conf)
+		echo "$suse_conf $suse_vers $suse_patchlevel  ${suse_vers}sp$suse_patchlevel" >> /tmp/log-nb
+		case ${suse_vers}sp$suse_patchlevel in # (
+		15sp0 ) LDISKFS_SERIES="4.12-sles15.series"
+			if test ! -f $LINUX/arch/x86/kernel/cpu/hygon.c ; then
+				# This file was added shortly after -150.22 so
+				# this must be 150.22 or earlier
+				LDISKFS_SERIES="4.12-sles15-22.series"
+			fi
+			;; # (
+		15sp1 ) LDISKFS_SERIES="4.12-sles15sp1.series"
+			if test ! -f $LINUX/arch/x86/kernel/cpu/umwait.c ; then
+				# This file was added after -197.7 so
+				# this must be -197.7 or earlier
+				LDISKFS_SERIES="4.12-sles15sp1-7.series"
+			fi
+			;;
+		esac
+	]
+	)], [LDISKFS_SERIES="5.4.0-ml.series"],
+	    [LDISKFS_SERIES="5.4.0-ml.series"])
 ], [test x$UBUNTU_KERNEL = xyes], [
 	AS_VERSION_COMPARE([$LINUXRELEASE],[5.3.0],[
 	AS_VERSION_COMPARE([$LINUXRELEASE],[5.0.0],[
@@ -110,7 +112,7 @@ AS_IF([test -z "$LDISKFS_SERIES"],
 [])
 AS_IF([test -z "$LDISKFS_SERIES"],
 	[AC_MSG_RESULT([failed to identify series])],
-	[AC_MSG_RESULT([$LDISKFS_SERIES])])
+	[AC_MSG_RESULT([$LDISKFS_SERIES for $LINUXRELEASE])])
 AC_SUBST(LDISKFS_SERIES)
 ]) # LDISKFS_LINUX_SERIES
 
@@ -293,28 +295,6 @@ AC_DEFUN([LDISKFS_AC_PATCH_PROGRAM], [
 ]) # LDISKFS_AC_PATCH_PROGRAM
 
 #
-# LB_HAVE_BVEC_ITER_ALL
-#
-# kernel 5.1 commit 6dc4f100c175dd0511ae8674786e7c9006cdfbfa
-# block: allow bio_for_each_segment_all() to iterate over multi-page bvec
-#
-AC_DEFUN([LB_HAVE_BVEC_ITER_ALL], [
-tmp_flags="$EXTRA_KCFLAGS"
-EXTRA_KCFLAGS="-Werror"
-LB_CHECK_COMPILE([if bvec_iter_all exists for multi-page bvec iternation],
-ext4fs_dirhash, [
-	#include <linux/bvec.h>
-],[
-	struct bvec_iter_all iter;
-	(void)iter;
-],[
-	AC_DEFINE(HAVE_BVEC_ITER_ALL, 1,
-		[if bvec_iter_all exists for multi-page bvec iternation])
-])
-EXTRA_KCFLAGS="$tmp_flags"
-]) # LB_HAVE_BVEC_ITER_ALL
-
-#
 # LB_LDISKFS_FIND_ENTRY_LOCKED_EXISTS
 #
 # kernel 5.2 commit 8a363970d1dc38c4ec4ad575c862f776f468d057
@@ -429,7 +409,6 @@ AS_IF([test x$enable_ldiskfs != xno],[
 	LB_EXT4_HAVE_INFO_DQUOT
 	LB_EXT4_HAVE_I_CRYPT_INFO
 	LB_LDISKFS_IGET_HAS_FLAGS_ARG
-	LB_HAVE_BVEC_ITER_ALL
 	LB_LDISKFS_FIND_ENTRY_LOCKED_EXISTS
 	LB_LDISKFSFS_DIRHASH_WANTS_DIR
 	AC_DEFINE(CONFIG_LDISKFS_FS_POSIX_ACL, 1, [posix acls for ldiskfs])
@@ -448,6 +427,10 @@ AC_MSG_RESULT([$enable_ldiskfs])
 AM_CONDITIONAL([LDISKFS_ENABLED], [test x$enable_ldiskfs = xyes])
 ]) # LB_CONFIG_LDISKFS
 
+
+AC_DEFUN([LB_EXT4_SRC_DIR_SRC], [])
+AC_DEFUN([LB_EXT4_SRC_DIR_RESULTS], [])
+
 #
 # LB_VALIDATE_EXT4_SRC_DIR
 #