---

yaml --- r: 53515 b: refs/heads/master c: 724c439 h: refs/heads/master i: 53513: 5643ff5 53511: cf86db5 v: v3
git-mirror · May 1, 2007 · 53be5b8 · 53be5b8
1 parent d442a84
commit 53be5b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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);