From 53be5b86cb247e6385bf882803388030dca9bddb Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 17 Apr 2007 17:22:13 -0400
Subject: [PATCH] --- yaml --- r: 53515 b: refs/heads/master c:
 724c439c204b12a3537b71289fb4c0a42c3aa566 h: refs/heads/master i:   53513:
 5643ff58642471cdbb0461df46c4af5a8f100d39   53511:
 cf86db585cd905f20139b8948486310b6e81976d v: v3

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

diff --git a/[refs] b/[refs]
index deb32d74661b..b4df48bed664 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d5658c949e6d89edc579a1f112aeee3bc232a8e
+refs/heads/master: 724c439c204b12a3537b71289fb4c0a42c3aa566
diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c
index 0a8bbc399689..424c4cea1208 100644
--- a/trunk/fs/nfs/write.c
+++ b/trunk/fs/nfs/write.c
@@ -1315,18 +1315,14 @@ long nfs_sync_mapping_wait(struct address_space *mapping, struct writeback_contr
 	how &= ~FLUSH_NOCOMMIT;
 	spin_lock(&nfsi->req_lock);
 	do {
-		wbc->pages_skipped = 0;
 		ret = nfs_wait_on_requests_locked(inode, idx_start, npages);
 		if (ret != 0)
 			continue;
 		if (nocommit)
 			break;
 		pages = nfs_scan_commit(inode, &head, idx_start, npages);
-		if (pages == 0) {
-			if (wbc->pages_skipped != 0)
-				continue;
+		if (pages == 0)
 			break;
-		}
 		if (how & FLUSH_INVALIDATE) {
 			spin_unlock(&nfsi->req_lock);
 			nfs_cancel_commit_list(&head);