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

Commit 8be2d234 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd4: minor cb_recall simplification 



Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent a7823c79

fs/nfsd/nfs4callback.c

+3 −5
Original line number Diff line number Diff line
@@ -817,8 +817,7 @@ static bool nfsd41_cb_get_slot(struct nfs4_client *clp, struct rpc_task *task) 
static void nfsd4_cb_prepare(struct rpc_task *task, void *calldata)

{

	struct nfsd4_callback *cb = calldata;

	struct nfs4_delegation *dp = container_of(cb, struct nfs4_delegation, dl_recall);

	struct nfs4_client *clp = dp->dl_stid.sc_client;

	struct nfs4_client *clp = cb->cb_clp;

	u32 minorversion = clp->cl_minorversion;



	cb->cb_minorversion = minorversion;
@@ -839,8 +838,7 @@ static void nfsd4_cb_prepare(struct rpc_task *task, void *calldata) 
static void nfsd4_cb_done(struct rpc_task *task, void *calldata)

{

	struct nfsd4_callback *cb = calldata;

	struct nfs4_delegation *dp = container_of(cb, struct nfs4_delegation, dl_recall);

	struct nfs4_client *clp = dp->dl_stid.sc_client;

	struct nfs4_client *clp = cb->cb_clp;



	dprintk("%s: minorversion=%d\n", __func__,

		clp->cl_minorversion);
@@ -863,7 +861,7 @@ static void nfsd4_cb_recall_done(struct rpc_task *task, void *calldata) 
{

	struct nfsd4_callback *cb = calldata;

	struct nfs4_delegation *dp = container_of(cb, struct nfs4_delegation, dl_recall);

	struct nfs4_client *clp = dp->dl_stid.sc_client;

	struct nfs4_client *clp = cb->cb_clp;

	struct rpc_clnt *current_rpc_client = clp->cl_cb_client;



	nfsd4_cb_done(task, calldata);