diff options
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r-- | fs/nfs/nfs4proc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 1dd2e407a901..9c77af900960 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -4017,7 +4017,7 @@ static int _nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock | |||
4017 | if (status != 0) | 4017 | if (status != 0) |
4018 | goto out; | 4018 | goto out; |
4019 | lsp = request->fl_u.nfs4_fl.owner; | 4019 | lsp = request->fl_u.nfs4_fl.owner; |
4020 | arg.lock_owner.id = lsp->ls_id.id; | 4020 | arg.lock_owner.id = lsp->ls_id; |
4021 | arg.lock_owner.s_dev = server->s_dev; | 4021 | arg.lock_owner.s_dev = server->s_dev; |
4022 | status = nfs4_call_sync(server->client, server, &msg, &arg.seq_args, &res.seq_res, 1); | 4022 | status = nfs4_call_sync(server->client, server, &msg, &arg.seq_args, &res.seq_res, 1); |
4023 | switch (status) { | 4023 | switch (status) { |
@@ -4262,7 +4262,7 @@ static struct nfs4_lockdata *nfs4_alloc_lockdata(struct file_lock *fl, | |||
4262 | goto out_free_seqid; | 4262 | goto out_free_seqid; |
4263 | p->arg.lock_stateid = &lsp->ls_stateid; | 4263 | p->arg.lock_stateid = &lsp->ls_stateid; |
4264 | p->arg.lock_owner.clientid = server->nfs_client->cl_clientid; | 4264 | p->arg.lock_owner.clientid = server->nfs_client->cl_clientid; |
4265 | p->arg.lock_owner.id = lsp->ls_id.id; | 4265 | p->arg.lock_owner.id = lsp->ls_id; |
4266 | p->arg.lock_owner.s_dev = server->s_dev; | 4266 | p->arg.lock_owner.s_dev = server->s_dev; |
4267 | p->res.lock_seqid = p->arg.lock_seqid; | 4267 | p->res.lock_seqid = p->arg.lock_seqid; |
4268 | p->lsp = lsp; | 4268 | p->lsp = lsp; |
@@ -4679,7 +4679,7 @@ void nfs4_release_lockowner(const struct nfs4_lock_state *lsp) | |||
4679 | if (!args) | 4679 | if (!args) |
4680 | return; | 4680 | return; |
4681 | args->lock_owner.clientid = server->nfs_client->cl_clientid; | 4681 | args->lock_owner.clientid = server->nfs_client->cl_clientid; |
4682 | args->lock_owner.id = lsp->ls_id.id; | 4682 | args->lock_owner.id = lsp->ls_id; |
4683 | args->lock_owner.s_dev = server->s_dev; | 4683 | args->lock_owner.s_dev = server->s_dev; |
4684 | msg.rpc_argp = args; | 4684 | msg.rpc_argp = args; |
4685 | rpc_call_async(server->client, &msg, 0, &nfs4_release_lockowner_ops, args); | 4685 | rpc_call_async(server->client, &msg, 0, &nfs4_release_lockowner_ops, args); |