From 9b29fff0a8cbd95b45d82c5aa83731472849841d Mon Sep 17 00:00:00 2001 From: KOSAKI Motohiro Date: Wed, 7 Jan 2009 18:08:17 -0800 Subject: [PATCH] --- yaml --- r: 127583 b: refs/heads/master c: eeee9a8cd1e93c8b94e7788790fa9e2f8910c779 h: refs/heads/master i: 127581: 0256977fcc7e6a9d2ca917ff0d902efa9a2c150d 127579: 0ab1ec076afec5f6a27a48a6c2f48c2790a2d13f 127575: 0b6b2425ba37a3fc211bc4df32002fd0d2a81c17 127567: 3fc64e610e735aff5393d559f573e4700b304874 127551: eb1662397067246ca96d42890e8a5c1cb3adb386 v: v3 --- [refs] | 2 +- trunk/mm/vmscan.c | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index e2ba7836bda7..c06f99e9006f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c9f299d9862deadf9fbee3ca28d915fdb006975a +refs/heads/master: eeee9a8cd1e93c8b94e7788790fa9e2f8910c779 diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c index 6827d35954fb..e2b31a522a66 100644 --- a/trunk/mm/vmscan.c +++ b/trunk/mm/vmscan.c @@ -1376,13 +1376,16 @@ static void get_scan_ratio(struct zone *zone, struct scan_control *sc, zone_nr_pages(zone, sc, LRU_INACTIVE_ANON); file = zone_nr_pages(zone, sc, LRU_ACTIVE_FILE) + zone_nr_pages(zone, sc, LRU_INACTIVE_FILE); - free = zone_page_state(zone, NR_FREE_PAGES); - /* If we have very few page cache pages, force-scan anon pages. */ - if (unlikely(file + free <= zone->pages_high)) { - percent[0] = 100; - percent[1] = 0; - return; + if (scan_global_lru(sc)) { + free = zone_page_state(zone, NR_FREE_PAGES); + /* If we have very few page cache pages, + force-scan anon pages. */ + if (unlikely(file + free <= zone->pages_high)) { + percent[0] = 100; + percent[1] = 0; + return; + } } /*