From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Tue, 18 Jul 2017 00:00:46 +0000 (-0400)
Subject: NFS: Remove page group limit in nfs_flush_incompatible()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7e6cca6caf7230b049bd681c5400b01c365ee452;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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>
---

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))) {