From ce11723197579e89f3e9303bd0a71802ef8788a2 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 5 Dec 2006 00:36:56 -0500
Subject: [PATCH] --- yaml --- r: 42527 b: refs/heads/master c:
 9cf85e0a243b56f4ef8439a1e6430307fd9dcda6 h: refs/heads/master i:   42525:
 7852a607cdf6d28c68a845cede1d5329e18d1d5b   42523:
 ef6ac361b50ce4e3a7d23331ce34f929b7d3c1ac   42519:
 31a8a3af6ae83b13b4f82b9341bf5ea35a4711a8   42511:
 3d66dd7919e81cf7125e8d5c58bbb6d553000f1e   42495:
 cdaad9d7f27b0a9fb6a08cc1c1d353e7ef9b4a0c v: v3

---
 [refs]                  |  2 +-
 trunk/fs/nfs/pagelist.c | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index a57c5fc85308..c08cde2ff18e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3925675cb37cc9c3fd1d3f56ce0fa729f995f863
+refs/heads/master: 9cf85e0a243b56f4ef8439a1e6430307fd9dcda6
diff --git a/trunk/fs/nfs/pagelist.c b/trunk/fs/nfs/pagelist.c
index 47ae2b4dd1d4..bc9fab68b29c 100644
--- a/trunk/fs/nfs/pagelist.c
+++ b/trunk/fs/nfs/pagelist.c
@@ -288,11 +288,10 @@ long nfs_scan_dirty(struct address_space *mapping,
 	struct nfs_page *pgvec[NFS_SCAN_MAXENTRIES];
 	struct nfs_page *req;
 	pgoff_t idx_start, idx_end;
-	long count = wbc->nr_to_write;
 	long res = 0;
 	int found, i;
 
-	if (nfsi->ndirty == 0 || count <= 0)
+	if (nfsi->ndirty == 0)
 		return 0;
 	if (wbc->range_cyclic) {
 		idx_start = 0;
@@ -308,8 +307,6 @@ long nfs_scan_dirty(struct address_space *mapping,
 	for (;;) {
 		unsigned int toscan = NFS_SCAN_MAXENTRIES;
 
-		if (toscan > count)
-			toscan = count;
 		found = radix_tree_gang_lookup_tag(&nfsi->nfs_page_tree,
 				(void **)&pgvec[0], idx_start, toscan,
 				NFS_PAGE_TAG_DIRTY);
@@ -334,16 +331,11 @@ long nfs_scan_dirty(struct address_space *mapping,
 			res++;
 			if (res == LONG_MAX)
 				goto out;
-			count--;
-			if (count == 0)
-				goto out;
-
 next:
 			idx_start = req->wb_index + 1;
 		}
 	}
 out:
-	wbc->nr_to_write = count;
 	WARN_ON ((nfsi->ndirty == 0) != list_empty(&nfsi->dirty));
 	return res;
 }