From 8f1f7354643d2b1751870fc296883d68b8893ad6 Mon Sep 17 00:00:00 2001 From: qiyong Date: Thu, 1 Jun 2006 15:38:41 +0000 Subject: [PATCH] Fix changes on dcache.h. Compile OK with both gcc-3.4 and gcc-4.0 now. --- lustre/kernel_patches/patches/vfs_intent-2.6-fc5-fix.patch | 13 ++++++------- lustre/kernel_patches/series/2.6-fc5.series | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) 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 index d7cb584..e3a0f09 100644 --- a/lustre/kernel_patches/patches/vfs_intent-2.6-fc5-fix.patch +++ b/lustre/kernel_patches/patches/vfs_intent-2.6-fc5-fix.patch @@ -1,7 +1,7 @@ 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 +--- linux-2.6.15.i686-cy.orig/include/linux/dcache.h 2006-06-01 23:07:05.000000000 +0800 ++++ linux-2.6.15.i686-cy/include/linux/dcache.h 2006-06-01 23:10:21.000000000 +0800 @@ -4,7 +4,6 @@ #ifdef __KERNEL__ @@ -10,12 +10,11 @@ Index: linux-2.6.15.i686-cy/include/linux/dcache.h #include #include #include -@@ -42,8 +41,6 @@ +@@ -42,6 +41,7 @@ const unsigned char *name; }; --#include -- ++struct inode; + #include + 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 --- 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 -- 1.8.3.1