aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2007-04-17 17:22:13 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-04-30 22:17:08 -0700
commit724c439c204b12a3537b71289fb4c0a42c3aa566 (patch)
treed167ca161a3420c81759275b5ab3cc3611bd1db3 /fs/nfs
parent8d5658c949e6d89edc579a1f112aeee3bc232a8e (diff)
downloadkernel_samsung_smdk4412-724c439c204b12a3537b71289fb4c0a42c3aa566.zip
kernel_samsung_smdk4412-724c439c204b12a3537b71289fb4c0a42c3aa566.tar.gz
kernel_samsung_smdk4412-724c439c204b12a3537b71289fb4c0a42c3aa566.tar.bz2
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.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 0a8bbc3..424c4ce 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);