[PATCH v2 5/7] truncate: Change remove_from_page_cache

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Minchan Kim
Date: Sunday, January 2, 2011 - 8:44 am

This patch series changes remove_from_page_cache's page ref counting
rule. Page cache ref count is decreased in delete_from_page_cache.
So we don't need decreasing page reference by caller.

Cc: Dan Magenheimer <dan.magenheimer@oracle.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Nick Piggin <npiggin@kernel.dk>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Hugh Dickins <hughd@google.com>
Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Minchan Kim <minchan.kim@gmail.com>
---
 mm/truncate.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/mm/truncate.c b/mm/truncate.c
index 9ee5673..85404b0 100644
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -108,13 +108,12 @@ truncate_complete_page(struct address_space *mapping, struct page *page)
 	cancel_dirty_page(page, PAGE_CACHE_SIZE);
 
 	clear_page_mlock(page);
-	remove_from_page_cache(page);
+	delete_from_page_cache(page);
 	ClearPageMappedToDisk(page);
-	/* this must be after the remove_from_page_cache which
+	/* this must be after the delete_from_page_cache which
 	 * calls cleancache_put_page (and note page->mapping is now NULL)
 	 */
 	cleancache_flush_page(mapping, page);
-	page_cache_release(page);	/* pagecache ref */
 	return 0;
 }
 
-- 
1.7.0.4

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH v2 1/7] Introduce delete_from_page_cache, Minchan Kim, (Sun Jan 2, 8:44 am)
[PATCH v2 2/7] fuse: Change remove_from_page_cache, Minchan Kim, (Sun Jan 2, 8:44 am)
[PATCH v2 3/7] tlbfs: Change remove_from_page_cache, Minchan Kim, (Sun Jan 2, 8:44 am)
[PATCH v2 4/7] swap: Change remove_from_page_cache, Minchan Kim, (Sun Jan 2, 8:44 am)
[PATCH v2 5/7] truncate: Change remove_from_page_cache, Minchan Kim, (Sun Jan 2, 8:44 am)
[PATCH v2 6/7] Good bye remove_from_page_cache, Minchan Kim, (Sun Jan 2, 8:44 am)
[PATCH v2 7/7] Change __remove_from_page_cache, Minchan Kim, (Sun Jan 2, 8:44 am)
Re: [PATCH v2 6/7] Good bye remove_from_page_cache, KAMEZAWA Hiroyuki, (Mon Jan 3, 6:44 pm)
Re: [PATCH v2 7/7] Change __remove_from_page_cache, KAMEZAWA Hiroyuki, (Mon Jan 3, 6:45 pm)