X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=ldiskfs%2Fconfig%2Fldiskfs-build.m4;h=be144deb877cc3054fc29bce5f670293e2a39660;hb=f60b861e3e526d33aa504f90385727ff74f290ba;hp=d87e9f8e5c3466146272ce421abad5a727ad9b5a;hpb=bea31adb586aeab93e1c42594dfc0fdabb554349;p=fs%2Flustre-release.git

diff --git a/ldiskfs/config/ldiskfs-build.m4 b/ldiskfs/config/ldiskfs-build.m4
index d87e9f8..be144de 100644
--- a/ldiskfs/config/ldiskfs-build.m4
+++ b/ldiskfs/config/ldiskfs-build.m4
@@ -627,82 +627,30 @@ AC_MSG_RESULT([$LDISKFS_SYMBOLS])
 AC_SUBST(LDISKFS_SYMBOLS)
 ])
 
-AC_DEFUN([LB_LDISKFS_RELEASE],
-[
-AC_MSG_CHECKING([ldiskfs source release])
-if test -r $LDISKFS_OBJ/config.h; then
-	tmp_flags="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="-I$LDISKFS_DIR $EXTRA_KCFLAGS"
-	LB_LINUX_TRY_MAKE([
-		#undef PACKAGE_NAME
-		#undef PACKAGE_TARNAME
-		#undef PACKAGE_VERSION
-		#undef PACKAGE_STRING
-		#undef PACKAGE_BUGREPORT
-		#undef PACKAGE
-		#undef VERSION
-		#undef STDC_HEADERS
-
-		#include <$LDISKFS_OBJ/config.h>
-	],[
-		char *LDISKFS_RELEASE;
-		LDISKFS_RELEASE=VERSION;
-	],[
-		$makerule LUSTRE_KERNEL_TEST=conftest.i
-	],[
-		test -s build/conftest.i
-	],[
-		eval $(grep "LDISKFS_RELEASE=" build/conftest.i)
-	],[
-		AC_MSG_RESULT([unknown])
-		AC_MSG_ERROR([Could not preprocess test program.])
-	])
-	EXTRA_KCFLAGS="$tmp_flags"
-	rm build/conftest.i
-elif test -r $LDISKFS_DIR/configure.ac; then
-	LDISKFS_RELEASE=$(awk '/AC\_INIT/ { print [$]3 }' \
-		 $LDISKFS_DIR/configure.ac | tr ',' '\n')
-else
-	AC_MSG_RESULT([unknown])
-	AC_MSG_ERROR([Could not locate config.h, META, or configure.ac to check release.])
-fi
-
-if test x$LDISKFS_RELEASE = x; then
-	AC_MSG_RESULT([unknown])
-	AC_MSG_ERROR([Could not determine ldiskfs release.])
-fi
-
-AC_MSG_RESULT([$LDISKFS_RELEASE])
-AC_SUBST(LDISKFS_RELEASE)
-])
-
 AC_DEFUN([LB_LDISKFS_SERIES],
 [
-if $1; then
+LDISKFS_SERIES=
+AS_IF([$1], [
 	AC_MSG_CHECKING([which ldiskfs series to use])
-	case $LINUXRELEASE in
-	2.6.32*)
-		if test x$RHEL_KERNEL = xyes; then
-			LDISKFS_SERIES="2.6-rhel6.series"
-		fi
-		if test x$SUSE_KERNEL = xyes; then
-			LDISKFS_SERIES="2.6-sles11.series"
-		fi
-		;;
-	3.0.*)
-		if test x$SUSE_KERNEL = xyes; then
-			LDISKFS_SERIES="3.0-sles11.series"
-		fi
-		;;
-	*)
-		AC_MSG_WARN([Unknown kernel version $LINUXRELEASE])
-		LDISKFS_SERIES=
-		;;
-	esac
+
+	SER=
+	AS_IF([test x$RHEL_KERNEL = xyes], [
+		AS_VERSION_COMPARE([$LINUXRELEASE],[2.6.32-343],[
+		AS_VERSION_COMPARE([$LINUXRELEASE],[2.6.32],[],
+		[SER="2.6-rhel6.series"],[SER="2.6-rhel6.series"])],
+		[SER="2.6-rhel6.4.series"],[SER="2.6-rhel6.4.series"])
+	], [test x$SUSE_KERNEL = xyes], [
+		AS_VERSION_COMPARE([$LINUXRELEASE],[3.0.0],[
+		AS_VERSION_COMPARE([$LINUXRELEASE],[2.6.32],[],
+		[SER="2.6-sles11.series"],[SER="2.6-sles11.series"])],
+		[SER="3.0-sles11.series"],[SER="3.0-sles11.series"])
+	])
+	LDISKFS_SERIES=$SER
+
+	AS_IF([test -z "$LDISKFS_SERIES"],
+		[AC_MSG_WARN([Unknown kernel version $LINUXRELEASE])])
 	AC_MSG_RESULT([$LDISKFS_SERIES])
-else
-	LDISKFS_SERIES=
-fi
+])
 AC_SUBST(LDISKFS_SERIES)
 ])
 
@@ -726,6 +674,25 @@ AC_DEFUN([LB_EXT_FREE_BLOCKS_WITH_BUFFER_HEAD],
 ])
 
 #
+# 2.6.35 renamed ext_pblock to ext4_ext_pblock(ex)
+#
+AC_DEFUN([LB_EXT_PBLOCK],
+[AC_MSG_CHECKING([if kernel has ext_pblocks])
+ LB_LINUX_TRY_COMPILE([
+	#include <linux/fs.h>
+	#include "$EXT_DIR/ext4_extents.h"
+],[
+	ext_pblock(NULL);
+],[
+	AC_MSG_RESULT([yes])
+	AC_DEFINE(HAVE_EXT_PBLOCK, 1,
+		  [kernel has ext_pblocks])
+],[
+	AC_MSG_RESULT([no])
+])
+])
+
+#
 # LDISKFS_AC_PATCH_PROGRAM
 #
 # Determine which program should be used to apply the patches to