From 058b2c16dbb0386f2b263226b95a225c62dba487 Mon Sep 17 00:00:00 2001
From: yangsheng <yangsheng>
Date: Mon, 25 May 2009 12:20:51 +0000
Subject: [PATCH] Branch b_release_1_8_1 b=18668

i=johann, girish

Patch for ext4 build.
---
 ldiskfs/configure.ac                                    | 14 +++++++++++---
 ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series |  1 -
 lustre/lvfs/autoMakefile.am                             |  3 +++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ldiskfs/configure.ac b/ldiskfs/configure.ac
index a57aa75..1102b81 100644
--- a/ldiskfs/configure.ac
+++ b/ldiskfs/configure.ac
@@ -92,12 +92,20 @@ LB_DEFINE_LDISKFS_OPTIONS
 
 AC_MSG_CHECKING([whether to build ldisk based on ext4])
 AC_ARG_ENABLE([ext4],
-	      AC_HELP_STRING([--enable-ext4],
-			     [enable building of ldiskfs based on ext4]),
+	      AC_HELP_STRING([--disable-ext4],
+			     [enable building of ldiskfs based on ext4]),[],
 			     [LC_KERNEL_WITH_EXT4([enable_ext4='yes'],
-			     [enable_ext4='no'])],[])
+			     [enable_ext4='no'])])
 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
diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series
index 31d4bc7..a988805 100644
--- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series
@@ -16,7 +16,6 @@ ext4-xattr-no-update-ctime-sles11.patch
 ext4-prealloc-sles11.patch
 ext4-mballoc-extra-checks-sles11.patch
 ext4-big-endian-check-2.6-sles11.patch
-#ext4-alloc-policy-2.6-sles11.patch
 ext4-misc-sles11.patch
 ext4-ext_generation-sles11.patch
 ext4-remove-ioctl-filp-sles11.patch
diff --git a/lustre/lvfs/autoMakefile.am b/lustre/lvfs/autoMakefile.am
index a85924e..2443191 100644
--- a/lustre/lvfs/autoMakefile.am
+++ b/lustre/lvfs/autoMakefile.am
@@ -77,6 +77,9 @@ ldiskfs_sed_flags = \
 
 fsfilt_ldiskfs.c: fsfilt_ext3.c
 	sed $(strip $(ldiskfs_sed_flags)) $< > $@
+	if grep -q '^#define\(.*\)HAVE_EXT4_LDISKFS' @LDISKFS_DIR@/config.h ; then \
+		sed -i -e "/DEBUG_SUBSYSTEM\(.*\)S_FILTER/a\#define HAVE_EXT4_LDISKFS 1" $@ ;\
+	fi
 fsfilt_ldiskfs_quota.h: fsfilt_ext3_quota.h
 	sed $(strip $(ldiskfs_sed_flags)) $< > $@
 
-- 
1.8.3.1