summary refs log tree commit diff
path: root/fs/nfs/nfs4state.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/nfs4state.c
parent8d42443166a5d3800756db98498a4961a5ea5de7 (diff)
downloadlinux-d51fdb87a611f8ef50518df7187173ae10469fd0.tar.gz
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/nfs4state.c')
-rw-r--r--fs/nfs/nfs4state.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 4f1de9be10c6..26b6b8b0cae3 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -953,7 +953,7 @@ static int nfs4_copy_lock_stateid(nfs4_stateid *dst,
 	if (test_bit(LK_STATE_IN_USE, &state->flags) == 0)
 		goto out;
 
-	fl_owner = l_ctx->lockowner.l_owner;
+	fl_owner = l_ctx->lockowner;
 	fl_flock_owner = l_ctx->open_context->flock_owner;
 
 	spin_lock(&state->state_lock);