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

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

nfs41: lock sequence setup/done support 



Separate nfs4_lock 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&lt;andros@netapp.com>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
[pnfs: client data server write validate and release]
[use nfs4_sequence_done_free_slot]
Signed-off-by: default avatarAndy <Adamson&lt;andros@umich.edu>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent d898528c

fs/nfs/nfs4proc.c

+8 −0
Original line number Diff line number Diff line
@@ -3688,6 +3688,7 @@ struct nfs4_lockdata { 
	unsigned long timestamp;

	int rpc_status;

	int cancelled;

	struct nfs_server *server;

};



static struct nfs4_lockdata *nfs4_alloc_lockdata(struct file_lock *fl,
@@ -3715,6 +3716,7 @@ static struct nfs4_lockdata *nfs4_alloc_lockdata(struct file_lock *fl, 
	p->res.lock_seqid = p->arg.lock_seqid;

	p->res.seq_res.sr_slotid = NFS4_MAX_SLOT_TABLE;

	p->lsp = lsp;

	p->server = server;

	atomic_inc(&lsp->ls_count);

	p->ctx = get_nfs_open_context(ctx);

	memcpy(&p->fl, fl, sizeof(p->fl));
@@ -3744,6 +3746,9 @@ static void nfs4_lock_prepare(struct rpc_task *task, void *calldata) 
	} else

		data->arg.new_lock_owner = 0;

	data->timestamp = jiffies;

	if (nfs4_setup_sequence(data->server->nfs_client, &data->arg.seq_args,

				&data->res.seq_res, 1, task))

		return;

	rpc_call_start(task);

	dprintk("%s: done!, ret = %d\n", __func__, data->rpc_status);

}
@@ -3754,6 +3759,9 @@ static void nfs4_lock_done(struct rpc_task *task, void *calldata) 


	dprintk("%s: begin!\n", __func__);



	nfs4_sequence_done_free_slot(data->server, &data->res.seq_res,

				     task->tk_status);



	data->rpc_status = task->tk_status;

	if (RPC_ASSASSINATED(task))

		goto out;