From: girish <girish>
Date: Mon, 1 Jun 2009 15:25:31 +0000 (+0000)
Subject: b=16893
X-Git-Tag: v1_9_0_200~37
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=a4170264e3871b47963108834f69324384315d28

b=16893
i=adilger

Allow ext4 to be built with RHEL5 kernel
---

diff --git a/ldiskfs/configure.ac b/ldiskfs/configure.ac
index b1b3424..405b8e3 100644
--- a/ldiskfs/configure.ac
+++ b/ldiskfs/configure.ac
@@ -90,28 +90,29 @@ AM_CONDITIONAL(USE_QUILT, test x$QUILT != xno)
 
 LB_DEFINE_LDISKFS_OPTIONS
 
-AC_MSG_CHECKING([whether to build ldisk based on ext4])
-AC_ARG_ENABLE([ext4],
-	      AC_HELP_STRING([--disable-ext4],
-			     [enable building of ldiskfs based on ext4]),[],
-			     [LC_KERNEL_WITH_EXT4([enable_ext4='yes'],
-			     [enable_ext4='no'])])
+AC_MSG_CHECKING([whether to build ldiskfs based on ext4])
+if test x$RHEL_KERNEL = xyes; then
+	AC_ARG_ENABLE([ext4],
+		AC_HELP_STRING([--enable-ext4],
+			     [enable building of ldiskfs based on ext4]),
+			     [], [enable_ext4='no'])
+else
+	case $LINUXRELEASE in
+	# ext4 was in 2.6.22-2.6.26 but not stable enough to use
+	2.6.2[06]*) enable_ext4='no' ;;
+	*) LC_KERNEL_WITH_EXT4([enable_ext4='yes'],
+			       [enable_ext4='no']) ;;
+	esac
+fi
 AC_MSG_RESULT([$enable_ext4])
 
-# Remove this part when RHEL5 ext4 patches landed.
-case $LINUXRELEASE in
-2.6.18*) if test x$RHEL_KENEL = xyes; then
-	enable_ext4=no
-	fi
-;;
-esac
-
 if test x$enable_ext4 = xyes ; then
-        AC_DEFINE(HAVE_EXT4_LDISKFS, 1, [ldiskfs based on ext4])
-        BACKFS=ext4
+	AC_DEFINE(HAVE_EXT4_LDISKFS, 1, [ldiskfs based on ext4])
+	BACKFS=ext4
 else
-        BACKFS=ext3
+	BACKFS=ext3
 fi
+
 AC_SUBST(BACKFS)
 BACKFSU=${BACKFS/ext/EXT}
 AC_SUBST(BACKFSU) # We need a Upper string