From e40004623f77bed575ea51f2857a84d6adab4ab2 Mon Sep 17 00:00:00 2001
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Sat, 18 Oct 2008 20:28:09 -0700
Subject: [PATCH] --- yaml --- r: 115935 b: refs/heads/master c:
 b7abea9630bc8ffc663a751e46680db25c4cdf8d h: refs/heads/master i:   115933:
 459a325d8d7c34bec7a6ea979a6e6595fe791a20   115931:
 c45abddb0a9911fc20f0bd28cf614b688ae9959d   115927:
 c7d217b99dc1ffeee9bb1fd66db58dbf458cf20b   115919:
 8f66269c7e18003b9087a4a822d42a98423b8107   115903:
 38a8d5f5ee2c9020f49380575a7ba39fa19daeb6 v: v3

---
 [refs]                | 2 +-
 trunk/mm/filemap.c    | 2 +-
 trunk/mm/memcontrol.c | 1 +
 trunk/mm/migrate.c    | 9 +++++++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7dc9767b11fb..635113aab27b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 073e587ec2cc377867e53d8b8959738a8e16cff6
+refs/heads/master: b7abea9630bc8ffc663a751e46680db25c4cdf8d
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
index e1b23fda48de..ab8553658af3 100644
--- a/trunk/mm/filemap.c
+++ b/trunk/mm/filemap.c
@@ -116,12 +116,12 @@ void __remove_from_page_cache(struct page *page)
 {
 	struct address_space *mapping = page->mapping;
 
-	mem_cgroup_uncharge_cache_page(page);
 	radix_tree_delete(&mapping->page_tree, page->index);
 	page->mapping = NULL;
 	mapping->nrpages--;
 	__dec_zone_page_state(page, NR_FILE_PAGES);
 	BUG_ON(page_mapped(page));
+	mem_cgroup_uncharge_cache_page(page);
 
 	/*
 	 * Some filesystems seem to re-dirty the page even after
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index e93a4db93fbe..6f8b5b3b38b2 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -734,6 +734,7 @@ void mem_cgroup_uncharge_page(struct page *page)
 void mem_cgroup_uncharge_cache_page(struct page *page)
 {
 	VM_BUG_ON(page_mapped(page));
+	VM_BUG_ON(page->mapping);
 	__mem_cgroup_uncharge_common(page, MEM_CGROUP_CHARGE_TYPE_CACHE);
 }
 
diff --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c
index 11c6c56ec017..6602941bfab0 100644
--- a/trunk/mm/migrate.c
+++ b/trunk/mm/migrate.c
@@ -330,8 +330,6 @@ static int migrate_page_move_mapping(struct address_space *mapping,
 	__inc_zone_page_state(newpage, NR_FILE_PAGES);
 
 	spin_unlock_irq(&mapping->tree_lock);
-	if (!PageSwapCache(newpage))
-		mem_cgroup_uncharge_cache_page(page);
 
 	return 0;
 }
@@ -341,6 +339,8 @@ static int migrate_page_move_mapping(struct address_space *mapping,
  */
 static void migrate_page_copy(struct page *newpage, struct page *page)
 {
+	int anon;
+
 	copy_highpage(newpage, page);
 
 	if (PageError(page))
@@ -378,8 +378,13 @@ static void migrate_page_copy(struct page *newpage, struct page *page)
 #endif
 	ClearPagePrivate(page);
 	set_page_private(page, 0);
+	/* page->mapping contains a flag for PageAnon() */
+	anon = PageAnon(page);
 	page->mapping = NULL;
 
+	if (!anon) /* This page was removed from radix-tree. */
+		mem_cgroup_uncharge_cache_page(page);
+
 	/*
 	 * If any waiters have accumulated on the new page then
 	 * wake them up.