From 784ce4d3a67f20d5aa15a4495f3862e9da2fe775 Mon Sep 17 00:00:00 2001
From: Ying Han <yinghan@google.com>
Date: Thu, 12 Apr 2012 12:49:16 -0700
Subject: [PATCH] --- yaml --- r: 299067 b: refs/heads/master c:
 41c93088127df2579e8ca64010929ec9e41d5543 h: refs/heads/master i:   299065:
 50e9acc3f729806337ec2e983ada79ec78d3de7a   299063:
 88e0b118bac974647268614516c2718f1992071f v: v3

---
 [refs]            | 2 +-
 trunk/mm/vmscan.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 1f50ac58f650..210696ed9f3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66aebce747eaf9bc456bf1f1b217d8db843031d0
+refs/heads/master: 41c93088127df2579e8ca64010929ec9e41d5543
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
index 33c332bbab73..1a518684a32f 100644
--- a/trunk/mm/vmscan.c
+++ b/trunk/mm/vmscan.c
@@ -2107,12 +2107,7 @@ static void shrink_mem_cgroup_zone(int priority, struct mem_cgroup_zone *mz,
 		 * with multiple processes reclaiming pages, the total
 		 * freeing target can get unreasonably large.
 		 */
-		if (nr_reclaimed >= nr_to_reclaim)
-			nr_to_reclaim = 0;
-		else
-			nr_to_reclaim -= nr_reclaimed;
-
-		if (!nr_to_reclaim && priority < DEF_PRIORITY)
+		if (nr_reclaimed >= nr_to_reclaim && priority < DEF_PRIORITY)
 			break;
 	}
 	blk_finish_plug(&plug);