---

yaml --- r: 299067 b: refs/heads/master c: 41c9308 h: refs/heads/master i: 299065: 50e9acc 299063: 88e0b11 v: v3
git-mirror · Apr 12, 2012 · 784ce4d · 784ce4d
1 parent c63fa7b
commit 784ce4d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git 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
@@ -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);