summaryrefslogtreecommitdiffstats
path: root/fs/nfs/pagelist.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.com>2016-10-13 15:26:47 +1100
committerTrond Myklebust <trond.myklebust@primarydata.com>2016-12-01 17:57:07 -0500
commitb184b5c38e4640585126e44ef84f2dbdd0d23d5a (patch)
tree25de3c489b02736f94b4625797bd7850bdc3947f /fs/nfs/pagelist.c
parent4d3b55d3c7c8c628498fefac4779fc02de5af492 (diff)
downloadblackbird-op-linux-b184b5c38e4640585126e44ef84f2dbdd0d23d5a.tar.gz
blackbird-op-linux-b184b5c38e4640585126e44ef84f2dbdd0d23d5a.zip
NFS: remove l_pid field from nfs_lockowner
this field is not used in any important way and probably should have been removed by Commit: 8003d3c4aaa5 ("nfs4: treat lock owners as opaque values") which removed the pid argument from nfs4_get_lock_state. Except in unusual and uninteresting cases, two threads with the same ->tgid will have the same ->files pointer, so keeping them both for comparison brings no benefit. Acked-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: NeilBrown <neilb@suse.com> Reviewed-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/pagelist.c')
-rw-r--r--fs/nfs/pagelist.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index 965db474f4b0..161f8b13bbaa 100644
--- 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.l_owner == l2->lockowner.l_owner;
}
/**
OpenPOWER on IntegriCloud