summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2017-07-18 02:00:46 +0200
committerTrond Myklebust <trond.myklebust@primarydata.com>2017-08-15 17:54:47 +0200
commit7e6cca6caf7230b049bd681c5400b01c365ee452 (patch)
tree3b39eb5278d354e4a0f47642bedb3277269b5359 /fs
parentNFS: Teach nfs_try_to_update_request() to deal with request page_groups (diff)
downloadlinux-7e6cca6caf7230b049bd681c5400b01c365ee452.tar.xz
linux-7e6cca6caf7230b049bd681c5400b01c365ee452.zip
NFS: Remove page group limit in nfs_flush_incompatible()
nfs_try_to_update_request() should be able to cope now. Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/write.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 0b4d1ef168e0..08c1ce968cce 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1205,8 +1205,6 @@ int nfs_flush_incompatible(struct file *file, struct page *page)
l_ctx = req->wb_lock_context;
do_flush = req->wb_page != page ||
!nfs_match_open_context(req->wb_context, ctx);
- /* for now, flush if more than 1 request in page_group */
- do_flush |= req->wb_this_page != req;
if (l_ctx && flctx &&
!(list_empty_careful(&flctx->flc_posix) &&
list_empty_careful(&flctx->flc_flock))) {