From 3c04b1b530e1b0810ca9073eff69f7317f8e72cf Mon Sep 17 00:00:00 2001
From: Mel Gorman <mgorman@suse.de>
Date: Mon, 31 Oct 2011 17:07:59 -0700
Subject: [PATCH] --- yaml --- r: 272130 b: refs/heads/master c:
 49ea7eb65e7c5060807fb9312b1ad4c3eab82e2c h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/include/linux/mmzone.h |  2 +-
 trunk/mm/vmscan.c            | 10 +++++++++-
 trunk/mm/vmstat.c            |  2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 43cc46f309d7..18f0cf6cba26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92df3a723f84cdf8133560bbff950a7a99e92bc9
+refs/heads/master: 49ea7eb65e7c5060807fb9312b1ad4c3eab82e2c
diff --git a/trunk/include/linux/mmzone.h b/trunk/include/linux/mmzone.h
index 2c41b2c1943b..188cb2ffe8db 100644
--- a/trunk/include/linux/mmzone.h
+++ b/trunk/include/linux/mmzone.h
@@ -100,7 +100,7 @@ enum zone_stat_item {
 	NR_UNSTABLE_NFS,	/* NFS unstable pages */
 	NR_BOUNCE,
 	NR_VMSCAN_WRITE,
-	NR_VMSCAN_WRITE_SKIP,
+	NR_VMSCAN_IMMEDIATE,	/* Prioritise for reclaim when writeback ends */
 	NR_WRITEBACK_TEMP,	/* Writeback using temporary buffers */
 	NR_ISOLATED_ANON,	/* Temporary isolated pages from anon lru */
 	NR_ISOLATED_FILE,	/* Temporary isolated pages from file lru */
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
index 7b0573f33a27..a297603d35bc 100644
--- a/trunk/mm/vmscan.c
+++ b/trunk/mm/vmscan.c
@@ -866,7 +866,15 @@ static unsigned long shrink_page_list(struct list_head *page_list,
 			 */
 			if (page_is_file_cache(page) &&
 					(!current_is_kswapd() || priority >= DEF_PRIORITY - 2)) {
-				inc_zone_page_state(page, NR_VMSCAN_WRITE_SKIP);
+				/*
+				 * Immediately reclaim when written back.
+				 * Similar in principal to deactivate_page()
+				 * except we already have the page isolated
+				 * and know it's dirty
+				 */
+				inc_zone_page_state(page, NR_VMSCAN_IMMEDIATE);
+				SetPageReclaim(page);
+
 				goto keep_locked;
 			}
 
diff --git a/trunk/mm/vmstat.c b/trunk/mm/vmstat.c
index 210bd8ff3a6e..56e529a40517 100644
--- a/trunk/mm/vmstat.c
+++ b/trunk/mm/vmstat.c
@@ -702,7 +702,7 @@ const char * const vmstat_text[] = {
 	"nr_unstable",
 	"nr_bounce",
 	"nr_vmscan_write",
-	"nr_vmscan_write_skip",
+	"nr_vmscan_immediate_reclaim",
 	"nr_writeback_temp",
 	"nr_isolated_anon",
 	"nr_isolated_file",