Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

[linux-2.6-block.git] / fs / nfs / pagelist.c

diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index 965db474f4b0d11d7a59fe839703c7505d714ce9..6e629b856a00f2ebe52b4ba6badb356d49f380e6 100644 (file)
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -867,8 +867,7 @@ static void nfs_pageio_cleanup_mirroring(struct nfs_pageio_descriptor *pgio)
 static bool nfs_match_lock_context(const struct nfs_lock_context *l1,
                const struct nfs_lock_context *l2)
 {
-       return l1->lockowner.l_owner == l2->lockowner.l_owner
-               && l1->lockowner.l_pid == l2->lockowner.l_pid;
+       return l1->lockowner == l2->lockowner;
 }
 
 /**