diff options
-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); |