From 73107bf8aae7d4498de058d206319334ab8751d6 Mon Sep 17 00:00:00 2001 From: nic Date: Tue, 27 Apr 2004 19:54:21 +0000 Subject: [PATCH] b=3119 r=zab clear page->private before handing to FS --- lustre/ChangeLog | 1 + .../kernel_patches/patches/add_page_private.patch | 22 +++++++++++++++------- lustre/kernel_patches/series/chaos-2.4.21 | 2 +- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 1ae5fd4..67a84a6 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -4,6 +4,7 @@ tbd Cluster File Systems, Inc. - clear page cache after eviction (2766) - deal with strange write() on x86-64 (3043) - don't dereference NULL peer_ni in ldlm_handle_ast_error (3258) + - clear page->private before handing to FS (3119) tbd Cluster File Systems, Inc. * version 1.2.2 diff --git a/lustre/kernel_patches/patches/add_page_private.patch b/lustre/kernel_patches/patches/add_page_private.patch index f82fb92..f7cc567 100644 --- a/lustre/kernel_patches/patches/add_page_private.patch +++ b/lustre/kernel_patches/patches/add_page_private.patch @@ -1,10 +1,8 @@ - include/linux/mm.h | 1 + - 1 files changed, 1 insertion(+) - ---- linux-2.4.20-b_llpio-l21/include/linux/mm.h~add_page_private 2003-07-21 21:42:50.000000000 -0700 -+++ linux-2.4.20-b_llpio-l21-zab/include/linux/mm.h 2003-07-21 21:44:16.000000000 -0700 -@@ -162,6 +162,7 @@ typedef struct page { - protected by pagemap_lru_lock !! */ +Index: linux-ia64/include/linux/mm.h +=================================================================== +--- linux-ia64.orig/include/linux/mm.h 2004-04-27 12:39:16.000000000 -0700 ++++ linux-ia64/include/linux/mm.h 2004-04-27 12:42:10.000000000 -0700 +@@ -205,6 +205,7 @@ typedef struct page { struct page **pprev_hash; /* Complement to *next_hash. */ struct buffer_head * buffers; /* Buffer maps us to a disk block. */ + unsigned long private; @@ -13,3 +11,13 @@ * On machines where all RAM is mapped into kernel address space, _ +Index: linux-ia64/mm/filemap.c +=================================================================== +--- linux-ia64.orig/mm/filemap.c 2004-04-27 12:35:18.000000000 -0700 ++++ linux-ia64/mm/filemap.c 2004-04-27 12:42:47.000000000 -0700 +@@ -676,6 +676,7 @@ static inline void __add_to_page_cache(s + page_cache_get(page); + page->index = offset; ++ page->private = 0; + add_page_to_inode_queue(mapping, page); + add_page_to_hash_queue(page, hash); diff --git a/lustre/kernel_patches/series/chaos-2.4.21 b/lustre/kernel_patches/series/chaos-2.4.21 index bdcae1e..0003912 100644 --- a/lustre/kernel_patches/series/chaos-2.4.21 +++ b/lustre/kernel_patches/series/chaos-2.4.21 @@ -22,7 +22,7 @@ jbd-dont-account-blocks-twice.patch jbd-commit-tricks.patch ext3-o_direct-2.4.21-chaos.patch ext3-no-write-super-chaos.patch -add_page_private.patch +add_page_private.patch ext3-raw-lookup.patch nfs_export_kernel-2.4.21-chaos.patch ext3-ea-in-inode-2.4.21-chaos.patch -- 1.8.3.1