X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=config%2Flustre-build-ldiskfs.m4;h=6358dbf2fbd5f64d3905353d3bd9d0a04e3ed574;hb=5c2a1267f94715ca5e1e80bcb4d8fdbc51d4b0dd;hp=8c295b5adf0d9465a7641acadc71064fbf8f864b;hpb=fdd231b394699ae0fa53b387b3ab436c9e201b91;p=fs%2Flustre-release.git

diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4
index 8c295b5..6358dbf 100644
--- a/config/lustre-build-ldiskfs.m4
+++ b/config/lustre-build-ldiskfs.m4
@@ -13,51 +13,57 @@ esac
 AS_IF([test -z "$LDISKFS_SERIES"], [
 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],[
 	AS_VERSION_COMPARE([$LINUXRELEASE],[4.15.0],[
 	AS_VERSION_COMPARE([$LINUXRELEASE],[4.4.0], [],
 	[
@@ -85,12 +91,28 @@ AS_IF([test x$RHEL_KERNEL = xyes], [
 			[test $KPLEV -ge 20], [LDISKFS_SERIES="4.15.0-20-ubuntu18.series"]
 		)
 	],
-	[LDISKFS_SERIES="4.15.0-24-ubuntu18.series"])
+	[LDISKFS_SERIES="4.15.0-24-ubuntu18.series"])],
+	[LDISKFS_SERIES="5.0.0-13-ubuntu19.series"],
+	[LDISKFS_SERIES="5.0.0-13-ubuntu19.series"])],
+	[LDISKFS_SERIES="5.4.0-ml.series"],
+	[LDISKFS_SERIES="5.4.0-ml.series"])
 ])
 ])
+# Not RHEL/SLES or Ubuntu .. probably mainline
+AS_IF([test -z "$LDISKFS_SERIES"],
+	[
+	AS_VERSION_COMPARE([$LINUXRELEASE],[5.4.0],[],
+	[LDISKFS_SERIES="5.4.0-ml.series"],[
+	AS_VERSION_COMPARE([$LINUXRELEASE],[5.4.0],
+		[LDISKFS_SERIES="5.4.0-ml.series"], # lt
+		[LDISKFS_SERIES="5.4.0-ml.series"], # eq
+		[LDISKFS_SERIES="5.4.0-ml.series"]  # gt
+		)])
+	],
+[])
 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
 
@@ -134,12 +156,24 @@ ext4_journal_start, [
 # LB_EXT4_BREAD_4ARGS
 #
 # 3.18 ext4_bread has 4 arguments
+# NOTE: It may not be exported for modules, use a positive compiler test here.
 #
 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"
+
+	struct buffer_head *ext4_bread(handle_t *handle, struct inode *inode,
+				       ext4_lblk_t block, int map_flags)
+	{
+		struct buffer_head *bh = NULL;
+		(void)handle;
+		(void)inode;
+		(void)block;
+		(void)map_flags;
+		return bh;
+	}
 ],[
 	ext4_bread(NULL, NULL, 0, 0);
 ],[
@@ -261,26 +295,70 @@ AC_DEFUN([LDISKFS_AC_PATCH_PROGRAM], [
 ]) # LDISKFS_AC_PATCH_PROGRAM
 
 #
-# LB_HAVE_BVEC_ITER_ALL
+# LB_LDISKFS_FIND_ENTRY_LOCKED_EXISTS
+#
+# kernel 5.2 commit 8a363970d1dc38c4ec4ad575c862f776f468d057
+# ext4: avoid declaring fs inconsistent due to invalid file handles
+# __ext4_find_entry became a helper function for ext4_find_entry
+# conflicting with previous ldiskfs patches.
+# ldiskfs patches map ext4_find_entry to ldiskfs_find_entry_locked to
+# avoid conflicting with __ext4_find_entry
+#
+# When the following check succeeds __ext4_find_entry helper is not
+# used.
+#
+AC_DEFUN([LB_LDISKFS_FIND_ENTRY_LOCKED_EXISTS], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if __ldiskfs_find_entry is available],
+ldiskfs_find_entry_locked, [
+	#include <linux/fs.h>
+	#include "$EXT4_SRC_DIR/ext4.h"
+	#include "$EXT4_SRC_DIR/namei.c"
+
+	static int __ext4_find_entry(void) { return 0; }
+],[
+	int x = __ext4_find_entry();
+	(void)x;
+],[
+	AC_DEFINE(HAVE___LDISKFS_FIND_ENTRY, 1,
+		[if __ldiskfs_find_entry is available])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LB_LDISKFS_FIND_ENTRY_LOCKED_EXISTS
+
+#
+# LB_LDISKFSFS_DIRHASH_WANTS_DIR
 #
-# kernel 5.1 commit 6dc4f100c175dd0511ae8674786e7c9006cdfbfa
-# block: allow bio_for_each_segment_all() to iterate over multi-page bvec
+# kernel 5.2 commit 8a363970d1dc38c4ec4ad575c862f776f468d057
+# ext4fs_dirhash UNICODE support
 #
-AC_DEFUN([LB_HAVE_BVEC_ITER_ALL], [
+AC_DEFUN([LB_LDISKFSFS_DIRHASH_WANTS_DIR], [
 tmp_flags="$EXTRA_KCFLAGS"
 EXTRA_KCFLAGS="-Werror"
-LB_CHECK_COMPILE([if bvec_iter_all exists for multi-page bvec iternation],
+LB_CHECK_COMPILE([if ldiskfsfs_dirhash takes an inode argument],
 ext4fs_dirhash, [
-	#include <linux/bvec.h>
+	#include <linux/fs.h>
+	#include "$EXT4_SRC_DIR/ext4.h"
+
+	int ext4fs_dirhash(const struct inode *dir, const char *name, int len,
+			  struct dx_hash_info *hinfo)
+	{
+		(void)dir;
+		(void)name;
+		(void)len;
+		(void)hinfo;
+		return 0;
+	}
 ],[
-	struct bvec_iter_all iter;
-	(void)iter;
+	int f = ext4fs_dirhash(NULL, NULL, 0, NULL);
+	(void)f;
 ],[
-	AC_DEFINE(HAVE_BVEC_ITER_ALL, 1,
-		[if bvec_iter_all exists for multi-page bvec iternation])
+	AC_DEFINE(HAVE_LDISKFSFS_GETHASH_INODE_ARG, 1,
+		[if ldiskfsfs_dirhash takes an inode argument])
 ])
 EXTRA_KCFLAGS="$tmp_flags"
-]) # LB_HAVE_BVEC_ITER_ALL
+]) # LB_LDISKFSFS_DIRHASH_WANTS_DIR
 
 #
 # LB_CONFIG_LDISKFS
@@ -331,7 +409,8 @@ 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])
 	AC_DEFINE(CONFIG_LDISKFS_FS_SECURITY, 1, [fs security for ldiskfs])
 	AC_DEFINE(CONFIG_LDISKFS_FS_XATTR, 1, [extened attributes for ldiskfs])
@@ -348,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
 #