Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a893693c authored by Andy Adamson's avatar Andy Adamson Committed by Benny Halevy
Browse files

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: default avatarAndy Adamson <andros@netapp.com>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
[pnfs: client data server write validate and release]
Signed-off-by: default avatarAndy Adamson <andros@umich.edu>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
[nfs41: nfs4_sequence_free_slot use nfs_client for data server]
Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 66179efe

fs/nfs/nfs4proc.c

+9 −1
Original line number Diff line number Diff line
@@ -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);

}