diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-04-17 23:22:13 +0200 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-01 07:17:08 +0200 |
| commit | 724c439c204b12a3537b71289fb4c0a42c3aa566 (patch) | |
| tree | d167ca161a3420c81759275b5ab3cc3611bd1db3 /fs/nfs | |
| parent | NFS: Fix a buffer overflow in the allocation of struct nfs_read/writedata (diff) | |
| download | linux-724c439c204b12a3537b71289fb4c0a42c3aa566.tar.xz linux-724c439c204b12a3537b71289fb4c0a42c3aa566.zip | |
NFS: Clean up nfs_sync_mapping_wait()
It has no business touching wbc->pages_skipped.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/write.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 0a8bbc399689..424c4cea1208 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); |