Commit 9e6fa0bb authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker
Browse files

SUNRPC: Refactor rpc_restart_call/rpc_restart_call_prepare 



Clean up.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent ae67bd38

net/sunrpc/clnt.c

+17 −13
Original line number Diff line number Diff line
@@ -1464,20 +1464,13 @@ void rpc_force_rebind(struct rpc_clnt *clnt) 
}

EXPORT_SYMBOL_GPL(rpc_force_rebind);



/*

 * Restart an (async) RPC call from the call_prepare state.

 * Usually called from within the exit handler.

 */

int

rpc_restart_call_prepare(struct rpc_task *task)

static int

__rpc_restart_call(struct rpc_task *task, void (*action)(struct rpc_task *))

{

	task->tk_action = call_start;

	task->tk_status = 0;

	if (task->tk_ops->rpc_call_prepare != NULL)

		task->tk_action = rpc_prepare_task;

	task->tk_action = action;

	return 1;

}

EXPORT_SYMBOL_GPL(rpc_restart_call_prepare);



/*

 * Restart an (async) RPC call. Usually called from within the
@@ -1486,12 +1479,23 @@ EXPORT_SYMBOL_GPL(rpc_restart_call_prepare); 
int

rpc_restart_call(struct rpc_task *task)

{

	task->tk_action = call_start;

	task->tk_status = 0;

	return 1;

	return __rpc_restart_call(task, call_start);

}

EXPORT_SYMBOL_GPL(rpc_restart_call);



/*

 * Restart an (async) RPC call from the call_prepare state.

 * Usually called from within the exit handler.

 */

int

rpc_restart_call_prepare(struct rpc_task *task)

{

	if (task->tk_ops->rpc_call_prepare != NULL)

		return __rpc_restart_call(task, rpc_prepare_task);

	return rpc_restart_call(task);

}

EXPORT_SYMBOL_GPL(rpc_restart_call_prepare);



const char

*rpc_proc_name(const struct rpc_task *task)

{