b=20655

i=sheng.yang

- Fixed the patchless client build failure for ext4 on HEAD.

- And ldiskfs will be ext4 by default on HEAD for RHEL5.

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 419c686..11e6569 100644 (file)
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -8,7 +8,7 @@
 AC_DEFUN([LC_CONFIG_SRCDIR],
 [AC_CONFIG_SRCDIR([lustre/obdclass/obdo.c])
 libcfs_is_module=yes
 AC_DEFUN([LC_CONFIG_SRCDIR],
 [AC_CONFIG_SRCDIR([lustre/obdclass/obdo.c])
 libcfs_is_module=yes

-ldiskfs_is_ext4=no
+ldiskfs_is_ext4=yes

 ])
 
 #
 ])
 
 #

diff --git a/lustre/obdclass/hash.c b/lustre/obdclass/hash.c
index 6b801ef..5ad1e91 100644 (file)
--- a/lustre/obdclass/hash.c
+++ b/lustre/obdclass/hash.c
@@ -14,19 +14,14 @@
  */
 
 #include <linux/fs.h>
  */
 
 #include <linux/fs.h>

-
-#ifdef HAVE_EXT4_LDISKFS
-#include <ldiskfs/ldiskfs_jbd2.h>
-#else
-#include <linux/jbd.h>
-#endif
-

 #include <linux/sched.h>
 #ifdef HAVE_SERVER_SUPPORT
 
 #ifdef HAVE_EXT4_LDISKFS
 #include <linux/sched.h>
 #ifdef HAVE_SERVER_SUPPORT
 
 #ifdef HAVE_EXT4_LDISKFS

+#include <ldiskfs/ldiskfs_jbd2.h>

 #include <ldiskfs/ldiskfs.h>
 #else
 #include <ldiskfs/ldiskfs.h>
 #else

+#include <linux/jbd.h>

 #include <linux/ldiskfs_fs.h>
 #endif
 
 #include <linux/ldiskfs_fs.h>
 #endif
 

diff --git a/lustre/obdclass/mea.c b/lustre/obdclass/mea.c
index 2e5946a..550bc25 100644 (file)
--- a/lustre/obdclass/mea.c
+++ b/lustre/obdclass/mea.c
@@ -51,18 +51,13 @@
 
 #ifdef __KERNEL__
 
 
 #ifdef __KERNEL__
 

-#ifdef HAVE_EXT4_LDISKFS
-#include <ldiskfs/ldiskfs_jbd2.h>
-#else
-#include <linux/jbd.h>
-#endif
-

 #ifdef HAVE_SERVER_SUPPORT
 #ifdef HAVE_SERVER_SUPPORT

-/* LDISKFS_SB() */

 
 #ifdef HAVE_EXT4_LDISKFS
 
 #ifdef HAVE_EXT4_LDISKFS

+#include <ldiskfs/ldiskfs_jbd2.h>

 #include <ldiskfs/ldiskfs.h>
 #else
 #include <ldiskfs/ldiskfs.h>
 #else

+#include <linux/jbd.h>

 #include <linux/ldiskfs_fs.h>
 #endif
 
 #include <linux/ldiskfs_fs.h>
 #endif