X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=config%2Flustre-build-ldiskfs.m4;h=ced3468a930cf97dedf1789f5c916ae3144984d3;hb=0331487fbde09658d34ea2a28ee9f1c6d829b733;hp=96fc0e7176dde5c523444fc09d07cbc22da900b8;hpb=995921a5c1e53b4d717de21dd3210406f6833689;p=fs%2Flustre-release.git

diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4
index 96fc0e7..ced3468 100644
--- a/config/lustre-build-ldiskfs.m4
+++ b/config/lustre-build-ldiskfs.m4
@@ -2,16 +2,31 @@
 # LDISKFS_LINUX_SERIES
 #
 AC_DEFUN([LDISKFS_LINUX_SERIES], [
-LDISKFS_SERIES=
 AC_MSG_CHECKING([which ldiskfs series to use])
+case x$LDISKFS_SERIES in
+	x)			# not set
+		;;
+	*.series)		# set externally
+		;;
+	*) LDISKFS_SERIES=
+esac
+AS_IF([test -z "$LDISKFS_SERIES"], [
 AS_IF([test x$RHEL_KERNEL = xyes], [
 	case $RHEL_RELEASE_NO in
-	70)	LDISKFS_SERIES="3.10-rhel7.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],[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"])],
@@ -22,12 +37,42 @@ AS_IF([test x$RHEL_KERNEL = xyes], [
 			;;
 		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
+		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"])
+], [test x$UBUNTU_KERNEL = xyes], [
+	AS_VERSION_COMPARE([$LINUXRELEASE],[4.4.0],
+		[],
+		[
+			KPLEV=$(echo $LINUXRELEASE | sed -n 's/.*-\([0-9]\+\).*/\1/p')
+			AS_IF(
+				[test -z "$KPLEV"], [
+					AC_MSG_WARN([Failed to determine Kernel patch level. Assume latest.])
+					LDISKFS_SERIES="4.4.0-73-ubuntu14+16.series"
+				],
+				[test $KPLEV -ge 73], [LDISKFS_SERIES="4.4.0-73-ubuntu14+16.series"],
+				[test $KPLEV -ge 62], [LDISKFS_SERIES="4.4.0-62-ubuntu14+16.series"],
+				[test $KPLEV -ge 49], [LDISKFS_SERIES="4.4.0-49-ubuntu14+16.series"],
+				[LDISKFS_SERIES="4.4.0-45-ubuntu14+16.series"]
+			)
+		],
+		[LDISKFS_SERIES="4.4.0-73-ubuntu14+16.series"]
+	)
+])
 ])
 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
 
@@ -104,6 +149,44 @@ 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
+
+#
+# LB_EXT4_HAVE_INFO_DQUOT
+#
+# in linux 4.4 i_dqout is in ext4_inode_info, not in struct inode
+#
+AC_DEFUN([LB_EXT4_HAVE_INFO_DQUOT], [
+LB_CHECK_COMPILE([if i_dquot is in ext4_inode_info],
+ext4_info_dquot, [
+	#include <linux/fs.h>
+	#include <linux/quota.h>
+	#include "$EXT4_SRC_DIR/ext4.h"
+],[
+	struct ext4_inode_info in;
+	struct dquot *dq;
+
+	dq = in.i_dquot[0];
+],[
+	AC_DEFINE(HAVE_EXT4_INFO_DQUOT, 1, [i_dquot is in ext4_inode_info])
+])
+]) # LB_EXT4_HAVE_INFO_DQUOT
+
+#
 # LDISKFS_AC_PATCH_PROGRAM
 #
 # Determine which program should be used to apply the patches to
@@ -175,6 +258,7 @@ AS_IF([test x$enable_ldiskfs != xno],[
 	# set is available for the detected kernel.  For now, we just always
 	# set it to "yes".
 	AS_IF([test x$enable_ldiskfs = xmaybe], [enable_ldiskfs=yes])
+	AC_SUBST(ENABLE_LDISKFS, yes)
 
 	LDISKFS_LINUX_SERIES
 	LDISKFS_AC_PATCH_PROGRAM
@@ -182,12 +266,17 @@ AS_IF([test x$enable_ldiskfs != xno],[
 	LB_EXT_PBLOCK
 	LB_EXT4_JOURNAL_START_3ARGS
 	LB_LDISKFS_MAP_BLOCKS
+	LB_EXT4_BREAD_4ARGS
+	LB_EXT4_HAVE_INFO_DQUOT
 	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])
 	AC_DEFINE(CONFIG_LDISKFS_FS_RW, 1, [enable rw access for ldiskfs])
+	AC_DEFINE(CONFIG_LDISKFS_FS_ENCRYPTION, 1, [enable encryption for ldiskfs])
 	AC_SUBST(LDISKFS_SUBDIR, ldiskfs)
 	AC_DEFINE(HAVE_LDISKFS_OSD, 1, Enable ldiskfs osd)
+], [
+	AC_SUBST(ENABLE_LDISKFS, no)
 ])
 
 AC_MSG_CHECKING([whether to build ldiskfs])
@@ -199,7 +288,7 @@ AM_CONDITIONAL([LDISKFS_ENABLED], [test x$enable_ldiskfs = xyes])
 #
 # LB_VALIDATE_EXT4_SRC_DIR
 #
-# Spot check the existance of several source files common to ext4.
+# Spot check the existence of several source files common to ext4.
 # Detecting this at configure time allows us to avoid a potential build
 # failure and provide a useful error message to explain what is wrong.
 #
@@ -253,7 +342,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"],