From 144fa0134ad75cfed1f9e690f69fd0417e26d38a Mon Sep 17 00:00:00 2001
From: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Date: Thu, 13 Jan 2011 15:47:43 -0800
Subject: [PATCH] --- yaml --- r: 230839 b: refs/heads/master c:
 50de1dd967d4ba3b8a90ebe7a4f5feca24191317 h: refs/heads/master i:   230837:
 4332e75a00686c2cc1f6c604900c5119a9a833b2   230835:
 aff16e7b1f0d9d8832222492c5f3d36aae7bbfbd   230831:
 29d3619d6c2c4243aebf0692a0ec8e7612e6d61e v: v3

---
 [refs]                           | 2 +-
 trunk/include/linux/memcontrol.h | 5 ++---
 trunk/mm/memcontrol.c            | 5 ++---
 trunk/mm/migrate.c               | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 3327854278fc..ad5351ce36db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17295c88a160c6eea3fcf46cec9d08a0fcb02db9
+refs/heads/master: 50de1dd967d4ba3b8a90ebe7a4f5feca24191317
diff --git a/trunk/include/linux/memcontrol.h b/trunk/include/linux/memcontrol.h
index 067115ce6b3e..6a576f989437 100644
--- a/trunk/include/linux/memcontrol.h
+++ b/trunk/include/linux/memcontrol.h
@@ -98,7 +98,7 @@ extern int
 mem_cgroup_prepare_migration(struct page *page,
 	struct page *newpage, struct mem_cgroup **ptr);
 extern void mem_cgroup_end_migration(struct mem_cgroup *mem,
-	struct page *oldpage, struct page *newpage);
+	struct page *oldpage, struct page *newpage, bool migration_ok);
 
 /*
  * For memory reclaim.
@@ -251,8 +251,7 @@ mem_cgroup_prepare_migration(struct page *page, struct page *newpage,
 }
 
 static inline void mem_cgroup_end_migration(struct mem_cgroup *mem,
-					struct page *oldpage,
-					struct page *newpage)
+		struct page *oldpage, struct page *newpage, bool migration_ok)
 {
 }
 
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index 6424ba0fce83..8ab841031436 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -2896,7 +2896,7 @@ int mem_cgroup_prepare_migration(struct page *page,
 
 /* remove redundant charge if migration failed*/
 void mem_cgroup_end_migration(struct mem_cgroup *mem,
-	struct page *oldpage, struct page *newpage)
+	struct page *oldpage, struct page *newpage, bool migration_ok)
 {
 	struct page *used, *unused;
 	struct page_cgroup *pc;
@@ -2905,8 +2905,7 @@ void mem_cgroup_end_migration(struct mem_cgroup *mem,
 		return;
 	/* blocks rmdir() */
 	cgroup_exclude_rmdir(&mem->css);
-	/* at migration success, oldpage->mapping is NULL. */
-	if (oldpage->mapping) {
+	if (!migration_ok) {
 		used = oldpage;
 		unused = newpage;
 	} else {
diff --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c
index 5b7d1fd29621..46fe8cc13d67 100644
--- a/trunk/mm/migrate.c
+++ b/trunk/mm/migrate.c
@@ -768,7 +768,7 @@ static int unmap_and_move(new_page_t get_new_page, unsigned long private,
 
 uncharge:
 	if (!charge)
-		mem_cgroup_end_migration(mem, page, newpage);
+		mem_cgroup_end_migration(mem, page, newpage, rc == 0);
 unlock:
 	unlock_page(page);