NFS: don't use FLUSH_SYNC on WB_SYNC_NONE COMMIT calls (try #2)
Subsystems (2)
PATCH 1/1 NFS: don't use FLUSH_SYNC on WB_SYNC_NONE COMMIT calls (try #2)
WB_SYNC_NONE is supposed to mean "don't wait on anything". That should also include not waiting for COMMIT calls to complete.
WB_SYNC_NONE is also implied when wbc->nonblocking and wbc->for_background are set, so we can replace those checks in nfs_commit_unstable_pages with a check for WB_SYNC_NONE.
Signed-off-by Jeff Layton <[email protected]>
Reviewed-by Wu Fengguang <[email protected]>
--- fs/nfs/write.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-)
fs/nfs/write.c +9 -7
@@ -1431,15 +1431,17 @@ static int nfs_commit_unstable_pages(struct inode *inode, struct writeback_contrint flags =FLUSH_SYNC ;int ret =0 ; -/* Don't commit yet if this is a non-blocking flush and there are -* lots of outstanding writes for this mapping. -*/ -if (wbc->sync_mode ==WB_SYNC_NONE && - nfsi->ncommit <= (nfsi->npages >>1 )) - goto out_mark_dirty; +if (wbc->sync_mode ==WB_SYNC_NONE ) { +/* Don't commit yet if this is a non-blocking flush and there +* are a lot of outstanding writes for this mapping. +*/ +if (nfsi->ncommit <= (nfsi->npages >>1 )) + goto out_mark_dirty; -if (wbc->nonblocking || wbc->for_background) +/* don't wait for the COMMIT response */ flags =0 ; + } + ret =nfs_commit_inode (inode, flags);if (ret >=0 ) {if (wbc->sync_mode ==WB_SYNC_NONE ) {
Signature · 1 line
1.7.1
Quoted 9 lines · Jeff Layton
WB_SYNC_NONEis supposed to mean "don't wait on anything". That should also include not waiting for COMMIT calls to complete.
WB_SYNC_NONEis also implied whenwbc->nonblockingandwbc->for_backgroundare set, so we can replace those checks innfs_commit_unstable_pageswith a check forWB_SYNC_NONE.Signed-off-by Jeff Layton <[email protected]>Reviewed-by Wu Fengguang <[email protected]>
Thanks. Applied to nfs-for-next...
Cheers
Trond