locks: convert posix locks to file_lock_context

[thirdparty/linux.git] / fs / nfs / pagelist.c

diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index a3b62e15b4440f635f3b89b49559c39dabafdabc..29c7f33c9cf1b666b88fee7dc1ed2882fdb76825 100644 (file)
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -831,12 +831,10 @@ static bool nfs_can_coalesce_requests(struct nfs_page *prev,
        if (prev) {
                if (!nfs_match_open_context(req->wb_context, prev->wb_context))
                        return false;
-               if (req->wb_context->dentry->d_inode->i_flock != NULL &&
-                   !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) &&
+               if (flctx != NULL &&
+                   !(list_empty_careful(&flctx->flc_posix) &&
+                     list_empty_careful(&flctx->flc_flock)) &&
                    !nfs_match_lock_context(req->wb_lock_context,
                                            prev->wb_lock_context))
                        return false;