---

yaml --- r: 347039 b: refs/heads/master c: 3cf2384 h: refs/heads/master i: 347037: 52545e9 347035: 5d3f54b 347031: aa1d193 347023: e4e9568 347007: d8abd79 v: v3
git-mirror · Dec 18, 2012 · 03eec42 · 03eec42
1 parent ee91053
commit 03eec42
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d37dd5dcb955dd8c2cdd4eaef1f15d1b7ecbc379
+refs/heads/master: 3cf23841b4b76eb94d3f8d0fb3627690e4431413
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
@@ -1202,6 +1202,14 @@ static int too_many_isolated(struct zone *zone, int file,
 		isolated = zone_page_state(zone, NR_ISOLATED_ANON);
 	}
 
+	/*
+	 * GFP_NOIO/GFP_NOFS callers are allowed to isolate more pages, so they
+	 * won't get blocked by normal direct-reclaimers, forming a circular
+	 * deadlock.
+	 */
+	if ((sc->gfp_mask & GFP_IOFS) == GFP_IOFS)
+		inactive >>= 3;
+
 	return isolated > inactive;
 }