瀏覽代碼

NFS: Clean up nfs_sync_mapping_wait()

It has no business touching wbc->pages_skipped.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Trond Myklebust 18 年之前
父節點
當前提交
724c439c20
共有 1 個文件被更改,包括 1 次插入5 次删除
  1. 1 5
      fs/nfs/write.c

+ 1 - 5
fs/nfs/write.c

@@ -1315,18 +1315,14 @@ long nfs_sync_mapping_wait(struct address_space *mapping, struct writeback_contr
 	how &= ~FLUSH_NOCOMMIT;
 	how &= ~FLUSH_NOCOMMIT;
 	spin_lock(&nfsi->req_lock);
 	spin_lock(&nfsi->req_lock);
 	do {
 	do {
-		wbc->pages_skipped = 0;
 		ret = nfs_wait_on_requests_locked(inode, idx_start, npages);
 		ret = nfs_wait_on_requests_locked(inode, idx_start, npages);
 		if (ret != 0)
 		if (ret != 0)
 			continue;
 			continue;
 		if (nocommit)
 		if (nocommit)
 			break;
 			break;
 		pages = nfs_scan_commit(inode, &head, idx_start, npages);
 		pages = nfs_scan_commit(inode, &head, idx_start, npages);
-		if (pages == 0) {
-			if (wbc->pages_skipped != 0)
-				continue;
+		if (pages == 0)
 			break;
 			break;
-		}
 		if (how & FLUSH_INVALIDATE) {
 		if (how & FLUSH_INVALIDATE) {
 			spin_unlock(&nfsi->req_lock);
 			spin_unlock(&nfsi->req_lock);
 			nfs_cancel_commit_list(&head);
 			nfs_cancel_commit_list(&head);