mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 10:19:47 +00:00
nfs41: locku sequence setup/done support
Separate nfs4_locku calls from nfs41: sequence setup/done support Call nfs4_sequence_done from respective rpc_call_done methods. Note that we need to pass a pointer to the nfs_server in calls data for passing on to nfs4_sequence_done. Signed-off-by: Andy Adamson <andros@netapp.com> Signed-off-by: Benny Halevy <bhalevy@panasas.com> [pnfs: client data server write validate and release] Signed-off-by: Andy Adamson <andros@umich.edu> Signed-off-by: Benny Halevy <bhalevy@panasas.com> [nfs41: nfs4_sequence_free_slot use nfs_client for data server] Signed-off-by: Andy Adamson <andros@netapp.com> Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
66179efee3
commit
a893693c15
1 changed files with 9 additions and 1 deletions
|
@ -3533,7 +3533,7 @@ static struct nfs4_unlockdata *nfs4_alloc_unlockdata(struct file_lock *fl,
|
|||
struct nfs4_unlockdata *p;
|
||||
struct inode *inode = lsp->ls_state->inode;
|
||||
|
||||
p = kmalloc(sizeof(*p), GFP_KERNEL);
|
||||
p = kzalloc(sizeof(*p), GFP_KERNEL);
|
||||
if (p == NULL)
|
||||
return NULL;
|
||||
p->arg.fh = NFS_FH(inode);
|
||||
|
@ -3564,6 +3564,8 @@ static void nfs4_locku_done(struct rpc_task *task, void *data)
|
|||
{
|
||||
struct nfs4_unlockdata *calldata = data;
|
||||
|
||||
nfs4_sequence_done(calldata->server, &calldata->res.seq_res,
|
||||
task->tk_status);
|
||||
if (RPC_ASSASSINATED(task))
|
||||
return;
|
||||
switch (task->tk_status) {
|
||||
|
@ -3582,6 +3584,8 @@ static void nfs4_locku_done(struct rpc_task *task, void *data)
|
|||
if (nfs4_async_handle_error(task, calldata->server, NULL) == -EAGAIN)
|
||||
rpc_restart_call(task);
|
||||
}
|
||||
nfs4_sequence_free_slot(calldata->server->nfs_client,
|
||||
&calldata->res.seq_res);
|
||||
}
|
||||
|
||||
static void nfs4_locku_prepare(struct rpc_task *task, void *data)
|
||||
|
@ -3596,6 +3600,10 @@ static void nfs4_locku_prepare(struct rpc_task *task, void *data)
|
|||
return;
|
||||
}
|
||||
calldata->timestamp = jiffies;
|
||||
if (nfs4_setup_sequence(calldata->server->nfs_client,
|
||||
&calldata->arg.seq_args,
|
||||
&calldata->res.seq_res, 1, task))
|
||||
return;
|
||||
rpc_call_start(task);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue