aboutsummaryrefslogtreecommitdiffstats
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:58:13 -0500
commitd51fdb87a611f8ef50518df7187173ae10469fd0 (patch)
tree5c7b1f573e024cdc906641ede0f7d035bed2c016 /fs/nfs/pagelist.c
parentNFSv4: enhance nfs4_copy_lock_stateid to use a flock stateid if there is one (diff)
downloadlinux-dev-d51fdb87a611f8ef50518df7187173ae10469fd0.tar.xz
linux-dev-d51fdb87a611f8ef50518df7187173ae10469fd0.zip
NFS: discard nfs_lockowner structure.
It now has only one field and is only used in one structure. So replaced it in that structure by the field it contains. 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index 161f8b13bbaa..6e629b856a00 100644
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -867,7 +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;
+ return l1->lockowner == l2->lockowner;
}
/**