From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 17 Apr 2007 21:22:13 +0000 (-0400)
Subject: NFS: Clean up nfs_sync_mapping_wait()
X-Git-Tag: v2.6.22-rc1~1035^2~19
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=724c439c204b12a3537b71289fb4c0a42c3aa566;p=linux-2.6-omap-h63xx.git

NFS: Clean up nfs_sync_mapping_wait()

It has no business touching wbc->pages_skipped.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 0a8bbc39968..424c4cea120 100644
--- a/fs/nfs/write.c
+++ b/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);