[PATCH 2/2] reiser4 cachefs delete_from_page_cache

[Hugh Dickins]

Replace reiser4 and cachefs remove_from_page_cache,page_cache_release
by delete_from_page_cache.  Sorry, but this patch is incomplete:
reiser4-export-remove_from_page_cache.patch also needs updating (easiest
just to edit the patch itself), I'd better leave that part to you...

Signed-off-by: Hugh Dickins <hugh@xxxxxxxxxxx>
---
 fs/cachefs/block.c      |    3 +--
 fs/reiser4/page_cache.c |   10 +++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

--- 2.6.9-mm1/fs/cachefs/block.c	2004-10-22 13:07:38.000000000 +0100
+++ linux/fs/cachefs/block.c	2004-10-23 21:15:09.735234048 +0100
@@ -392,8 +392,7 @@ int cachefs_block_cow(struct cachefs_sup
 		page = xchg(&block->page, NULL);
 
 		mapping->a_ops->releasepage(page, GFP_NOFS);
-		remove_from_page_cache(page);
-		page_cache_release(page);
+		delete_from_page_cache(page);
 		page = NULL;
 
 		ret = add_to_page_cache_lru(newpage, mapping, block->bix,
--- 2.6.9-mm1/fs/reiser4/page_cache.c	2004-10-22 13:07:42.000000000 +0100
+++ linux/fs/reiser4/page_cache.c	2004-10-23 21:16:31.336828720 +0100
@@ -759,13 +759,9 @@ drop_page(struct page *page)
 #if defined(PG_skipped)
 	ClearPageSkipped(page);
 #endif
-	if (page->mapping != NULL) {
-		remove_from_page_cache(page);
-		unlock_page(page);
-		/* page removed from the mapping---decrement page counter */
-		page_cache_release(page);
-	} else
-		unlock_page(page);
+	if (page->mapping != NULL)
+		delete_from_page_cache(page);
+	unlock_page(page);
 }
 
 

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/