---

yaml --- r: 292621 b: refs/heads/master c: c38446c h: refs/heads/master i: 292619: c5e6f91 v: v3
git-mirror · Mar 22, 2012 · 83ccb0b · 83ccb0b
1 parent 12a66de
commit 83ccb0b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69c978232aaa99476f9bd002c2a29a84fa3779b5
+refs/heads/master: c38446cc65e1f2b3eb8630c53943b94c4f65f670
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
@@ -2112,7 +2112,12 @@ 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 && priority < DEF_PRIORITY)
+		if (nr_reclaimed >= nr_to_reclaim)
+			nr_to_reclaim = 0;
+		else
+			nr_to_reclaim -= nr_reclaimed;
+
+		if (!nr_to_reclaim && priority < DEF_PRIORITY)
 			break;
 	}
 	blk_finish_plug(&plug);