diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-04-17 17:22:13 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-01 01:17:08 -0400 |
commit | 724c439c204b12a3537b71289fb4c0a42c3aa566 (patch) | |
tree | d167ca161a3420c81759275b5ab3cc3611bd1db3 /fs | |
parent | 8d5658c949e6d89edc579a1f112aeee3bc232a8e (diff) |
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')
-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 | |||
1315 | how &= ~FLUSH_NOCOMMIT; | 1315 | how &= ~FLUSH_NOCOMMIT; |
1316 | spin_lock(&nfsi->req_lock); | 1316 | spin_lock(&nfsi->req_lock); |
1317 | do { | 1317 | do { |
1318 | wbc->pages_skipped = 0; | ||
1319 | ret = nfs_wait_on_requests_locked(inode, idx_start, npages); | 1318 | ret = nfs_wait_on_requests_locked(inode, idx_start, npages); |
1320 | if (ret != 0) | 1319 | if (ret != 0) |
1321 | continue; | 1320 | continue; |
1322 | if (nocommit) | 1321 | if (nocommit) |
1323 | break; | 1322 | break; |
1324 | pages = nfs_scan_commit(inode, &head, idx_start, npages); | 1323 | pages = nfs_scan_commit(inode, &head, idx_start, npages); |
1325 | if (pages == 0) { | 1324 | if (pages == 0) |
1326 | if (wbc->pages_skipped != 0) | ||
1327 | continue; | ||
1328 | break; | 1325 | break; |
1329 | } | ||
1330 | if (how & FLUSH_INVALIDATE) { | 1326 | if (how & FLUSH_INVALIDATE) { |
1331 | spin_unlock(&nfsi->req_lock); | 1327 | spin_unlock(&nfsi->req_lock); |
1332 | nfs_cancel_commit_list(&head); | 1328 | nfs_cancel_commit_list(&head); |