From 3c04cf414edbc129fd70d55c553afa662fc5b530 Mon Sep 17 00:00:00 2001 From: Shaohua Li Date: Mon, 31 Oct 2011 17:07:03 -0700 Subject: [PATCH] --- yaml --- r: 272113 b: refs/heads/master c: 3da367c3e5fca71d4e778fa565d9b098d5518f4a h: refs/heads/master i: 272111: 2801ddf62657fff490df10c00f01206ff807457d v: v3 --- [refs] | 2 +- trunk/mm/vmscan.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fb5206044acb..169cf245d6b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3fa36acbced23c563345de3179dfe1775f15be5e +refs/heads/master: 3da367c3e5fca71d4e778fa565d9b098d5518f4a diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c index b68a9342d5a3..b1520b077858 100644 --- a/trunk/mm/vmscan.c +++ b/trunk/mm/vmscan.c @@ -2005,12 +2005,14 @@ static void shrink_zone(int priority, struct zone *zone, enum lru_list l; unsigned long nr_reclaimed, nr_scanned; unsigned long nr_to_reclaim = sc->nr_to_reclaim; + struct blk_plug plug; restart: nr_reclaimed = 0; nr_scanned = sc->nr_scanned; get_scan_count(zone, sc, nr, priority); + blk_start_plug(&plug); while (nr[LRU_INACTIVE_ANON] || nr[LRU_ACTIVE_FILE] || nr[LRU_INACTIVE_FILE]) { for_each_evictable_lru(l) { @@ -2034,6 +2036,7 @@ static void shrink_zone(int priority, struct zone *zone, if (nr_reclaimed >= nr_to_reclaim && priority < DEF_PRIORITY) break; } + blk_finish_plug(&plug); sc->nr_reclaimed += nr_reclaimed; /*