---

yaml --- r: 356485 b: refs/heads/master c: 7c5bd70 h: refs/heads/master i: 356483: b3615d5 v: v3
git-mirror · Feb 24, 2013 · 59a7c02 · 59a7c02
1 parent 23bd3df
commit 59a7c02
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a6f512412c7aecd04134721ea392cc496e6c017
+refs/heads/master: 7c5bd705d8f983ae1868a126956f5aa3a6702e3f
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
@@ -1700,18 +1700,20 @@ static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc,
 			fraction[1] = 0;
 			denominator = 1;
 			goto out;
-		} else if (!inactive_file_is_low_global(zone)) {
-			/*
-			 * There is enough inactive page cache, do not
-			 * reclaim anything from the working set right now.
-			 */
-			fraction[0] = 0;
-			fraction[1] = 1;
-			denominator = 1;
-			goto out;
 		}
 	}
 
+	/*
+	 * There is enough inactive page cache, do not reclaim
+	 * anything from the anonymous working set right now.
+	 */
+	if (!inactive_file_is_low(lruvec)) {
+		fraction[0] = 0;
+		fraction[1] = 1;
+		denominator = 1;
+		goto out;
+	}
+
 	/*
 	 * With swappiness at 100, anonymous and file have the same priority.
 	 * This scanning priority is essentially the inverse of IO cost.