From 32ccefd8ecdd1d11678f1f86d8013382ab10a5df Mon Sep 17 00:00:00 2001 From: shaver Date: Tue, 15 Jul 2003 08:53:30 +0000 Subject: [PATCH] Land b_unify on b_devel. Highlights include: - intent rework from Peter and Phil - unification of VFS intent strategy for 2.4 and 2.5/2.6 - select 2.5 kernel patches from b_ad - all the whitespace fixes you can imagine. Complete diff for sanity-checking at http://off.net/~shaver/unify-landing.diff. --- lustre/kernel_patches/series/chaos | 3 ++- lustre/llite/iod.c | 7 +------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lustre/kernel_patches/series/chaos b/lustre/kernel_patches/series/chaos index 00ae7fd..b5f500c 100644 --- a/lustre/kernel_patches/series/chaos +++ b/lustre/kernel_patches/series/chaos @@ -2,7 +2,7 @@ dev_read_only.patch exports.patch kmem_cache_validate.patch lustre_version.patch -vfs_intent-2.4.18-18.patch +vfs_intent-2.4.18-18-chaos65.patch invalidate_show.patch iod-rmap-exports.patch export-truncate.patch @@ -17,4 +17,5 @@ extN-noread.patch extN-wantedi.patch extN-san.patch extN-2.4.18-ino_sb_fixup.patch +ext3-map_inode_page.patch iopen-2.4.18.patch diff --git a/lustre/llite/iod.c b/lustre/llite/iod.c index 4fd3ae4..b7fd66f 100644 --- a/lustre/llite/iod.c +++ b/lustre/llite/iod.c @@ -38,7 +38,6 @@ #include #include #include -#include "llite_internal.h" /* PG_inactive_clean is shorthand for rmap, we want free_high/low here.. */ #ifdef PG_inactive_clean @@ -47,6 +46,7 @@ #define DEBUG_SUBSYSTEM S_LLITE #include +#include "llite_internal.h" #ifndef list_for_each_prev_safe #define list_for_each_prev_safe(pos, n, head) \ @@ -56,11 +56,6 @@ extern spinlock_t inode_lock; -struct ll_writeback_pages { - obd_count npgs, max; - struct brw_page *pga; -}; - /* * check to see if we're racing with truncate and put the page in * the brw_page array. returns 0 if there is more room and 1 -- 1.8.3.1