merge b_devel into b_filterio

diff --git a/lustre/kernel_patches/series/chaos-2.4.18 b/lustre/kernel_patches/series/chaos-2.4.18
index 57b994c..830217a 100644 (file)
--- a/lustre/kernel_patches/series/chaos-2.4.18
+++ b/lustre/kernel_patches/series/chaos-2.4.18
@@ -20,3 +20,7 @@ extN-2.4.18-ino_sb_fixup.patch
 ext3-map_inode_page_2.4.18.patch
 ext3-error-export.patch
 iopen-2.4.18.patch
+jbd-dont-account-blocks-twice.patch
+jbd-commit-tricks.patch
+ext3-o_direct-1-2.4.18-chaos.patch
+ext3-no-write-super.patch

diff --git a/lustre/obdclass/obdo.c b/lustre/obdclass/obdo.c
index 51f7156..f1d1b27 100644 (file)
--- a/lustre/obdclass/obdo.c
+++ b/lustre/obdclass/obdo.c
@@ -25,7 +25,9 @@
  */
 
 #define DEBUG_SUBSYSTEM S_CLASS
-#define EXPORT_SYMTAB
+#ifndef EXPORT_SYMTAB
+# define EXPORT_SYMTAB
+#endif
 
 #include <linux/module.h>
 #include <linux/obd_class.h>