|
@@ -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);
|
|
|
}
|
|
|
|