diff options
-rw-r--r-- | fs/nfs/write.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 4d6d35dd2b4b..605e292501f4 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c | |||
@@ -1431,15 +1431,17 @@ static int nfs_commit_unstable_pages(struct inode *inode, struct writeback_contr | |||
1431 | int flags = FLUSH_SYNC; | 1431 | int flags = FLUSH_SYNC; |
1432 | int ret = 0; | 1432 | int ret = 0; |
1433 | 1433 | ||
1434 | /* Don't commit yet if this is a non-blocking flush and there are | 1434 | if (wbc->sync_mode == WB_SYNC_NONE) { |
1435 | * lots of outstanding writes for this mapping. | 1435 | /* Don't commit yet if this is a non-blocking flush and there |
1436 | */ | 1436 | * are a lot of outstanding writes for this mapping. |
1437 | if (wbc->sync_mode == WB_SYNC_NONE && | 1437 | */ |
1438 | nfsi->ncommit <= (nfsi->npages >> 1)) | 1438 | if (nfsi->ncommit <= (nfsi->npages >> 1)) |
1439 | goto out_mark_dirty; | 1439 | goto out_mark_dirty; |
1440 | 1440 | ||
1441 | if (wbc->nonblocking || wbc->for_background) | 1441 | /* don't wait for the COMMIT response */ |
1442 | flags = 0; | 1442 | flags = 0; |
1443 | } | ||
1444 | |||
1443 | ret = nfs_commit_inode(inode, flags); | 1445 | ret = nfs_commit_inode(inode, flags); |
1444 | if (ret >= 0) { | 1446 | if (ret >= 0) { |
1445 | if (wbc->sync_mode == WB_SYNC_NONE) { | 1447 | if (wbc->sync_mode == WB_SYNC_NONE) { |