locks: move flock locks to file_lock_context

Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Acked-by: Christoph Hellwig <hch@lst.de>

1 files changed, 6 insertions, 0 deletions

diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index 2b5e769beb16..a3b62e15b444 100644
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -826,6 +826,7 @@ static bool nfs_can_coalesce_requests(struct nfs_page *prev,
                                       struct nfs_pageio_descriptor *pgio)
 {
         size_t size;
+        struct file_lock_context *flctx;
 
         if (prev) {
                 if (!nfs_match_open_context(req->wb_context, prev->wb_context))
@@ -834,6 +835,11 @@ static bool nfs_can_coalesce_requests(struct nfs_page *prev,
                     !nfs_match_lock_context(req->wb_lock_context,
                                             prev->wb_lock_context))
                         return false;
+                flctx = req->wb_context->dentry->d_inode->i_flctx;
+                if (flctx != NULL && !list_empty_careful(&flctx->flc_flock) &&
+                    !nfs_match_lock_context(req->wb_lock_context,
+                                            prev->wb_lock_context))
+                        return false;
                 if (req_offset(req) != req_offset(prev) + prev->wb_bytes)
                         return false;
                 if (req->wb_page == prev->wb_page) {