Backout changes on dcache.h. Compile OK with gcc 4.0.3 now.

diff --git a/lustre/kernel_patches/patches/vfs_intent-2.6-fc5-fix.patch b/lustre/kernel_patches/patches/vfs_intent-2.6-fc5-fix.patch
new file mode 100644 (file)
index 0000000..d7cb584
--- /dev/null
+++ b/lustre/kernel_patches/patches/vfs_intent-2.6-fc5-fix.patch
@@ -0,0 +1,21 @@
+Index: linux-2.6.15.i686-cy/include/linux/dcache.h
+===================================================================
+--- linux-2.6.15.i686-cy.orig/include/linux/dcache.h   2006-06-01 01:21:17.000000000 +0800
++++ linux-2.6.15.i686-cy/include/linux/dcache.h        2006-06-01 01:21:30.000000000 +0800
+@@ -4,7 +4,6 @@
+ #ifdef __KERNEL__
+ 
+ #include <asm/atomic.h>
+-#include <linux/string.h>
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/cache.h>
+@@ -42,8 +41,6 @@
+       const unsigned char *name;
+ };
+ 
+-#include <linux/namei.h>
+-
+ struct dentry_stat_t {
+       int nr_dentry;
+       int nr_unused;

diff --git a/lustre/kernel_patches/series/2.6-fc5.series b/lustre/kernel_patches/series/2.6-fc5.series
index 7f06408..c9abdd0 100644 (file)
--- a/lustre/kernel_patches/series/2.6-fc5.series
+++ b/lustre/kernel_patches/series/2.6-fc5.series
@@ -17,3 +17,4 @@ export-show_task-2.6-fc5.patch
 sd_iostats-2.6-rhel4.patch 
 export_symbol_numa-2.6-fc5.patch 
 tcp-zero-copy-2.6-fc5.patch
+vfs_intent-2.6-fc5-fix.patch