From 3861d52cf4551d0383198619623a892667b68c05 Mon Sep 17 00:00:00 2001
From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date: Mon, 2 Feb 2009 18:33:49 +0200
Subject: [PATCH] --- yaml --- r: 130868 b: refs/heads/master c:
 dcf6a79dda5cc2a2bec183e50d829030c0972aaa h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/mm/page-writeback.c | 21 +++++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 95b88cc2989e..515a3492015e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5193535517825f9a07967e4868a1103013d0a99d
+refs/heads/master: dcf6a79dda5cc2a2bec183e50d829030c0972aaa
diff --git a/trunk/mm/page-writeback.c b/trunk/mm/page-writeback.c
index b493db7841dc..dc32dae01e5f 100644
--- a/trunk/mm/page-writeback.c
+++ b/trunk/mm/page-writeback.c
@@ -1051,13 +1051,22 @@ int write_cache_pages(struct address_space *mapping,
 				}
  			}
 
-			if (wbc->sync_mode == WB_SYNC_NONE) {
-				wbc->nr_to_write--;
-				if (wbc->nr_to_write <= 0) {
-					done = 1;
-					break;
-				}
+			if (nr_to_write > 0)
+				nr_to_write--;
+			else if (wbc->sync_mode == WB_SYNC_NONE) {
+				/*
+				 * We stop writing back only if we are not
+				 * doing integrity sync. In case of integrity
+				 * sync we have to keep going because someone
+				 * may be concurrently dirtying pages, and we
+				 * might have synced a lot of newly appeared
+				 * dirty pages, but have not synced all of the
+				 * old dirty pages.
+				 */
+				done = 1;
+				break;
 			}
+
 			if (wbc->nonblocking && bdi_write_congested(bdi)) {
 				wbc->encountered_congestion = 1;
 				done = 1;