Skip to content

Commit

Permalink
NFS: Clean up nfs_sync_mapping_wait()
Browse files Browse the repository at this point in the history
It has no business touching wbc->pages_skipped.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed May 1, 2007
1 parent 8d5658c commit 724c439
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions fs/nfs/write.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 724c439

Please sign in to comment.