Commit f1f88fc7 authored by Trond Myklebust's avatar Trond Myklebust

SUNRPC: The function rpc_restart_call() should return success/failure

Both rpc_restart_call_prepare() and rpc_restart_call() test for the
RPC_TASK_KILLED flag, and fail to restart the RPC call if that flag is set.

This patch allows callers to know whether or not the restart was
successful, so that they can perform cleanups etc in case of failure.
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent a6f03393
...@@ -148,8 +148,8 @@ int rpc_call_sync(struct rpc_clnt *clnt, ...@@ -148,8 +148,8 @@ int rpc_call_sync(struct rpc_clnt *clnt,
const struct rpc_message *msg, int flags); const struct rpc_message *msg, int flags);
struct rpc_task *rpc_call_null(struct rpc_clnt *clnt, struct rpc_cred *cred, struct rpc_task *rpc_call_null(struct rpc_clnt *clnt, struct rpc_cred *cred,
int flags); int flags);
void rpc_restart_call_prepare(struct rpc_task *); int rpc_restart_call_prepare(struct rpc_task *);
void rpc_restart_call(struct rpc_task *); int rpc_restart_call(struct rpc_task *);
void rpc_setbufsize(struct rpc_clnt *, unsigned int, unsigned int); void rpc_setbufsize(struct rpc_clnt *, unsigned int, unsigned int);
size_t rpc_max_payload(struct rpc_clnt *); size_t rpc_max_payload(struct rpc_clnt *);
void rpc_force_rebind(struct rpc_clnt *); void rpc_force_rebind(struct rpc_clnt *);
......
...@@ -756,12 +756,13 @@ EXPORT_SYMBOL_GPL(rpc_force_rebind); ...@@ -756,12 +756,13 @@ EXPORT_SYMBOL_GPL(rpc_force_rebind);
* Restart an (async) RPC call from the call_prepare state. * Restart an (async) RPC call from the call_prepare state.
* Usually called from within the exit handler. * Usually called from within the exit handler.
*/ */
void int
rpc_restart_call_prepare(struct rpc_task *task) rpc_restart_call_prepare(struct rpc_task *task)
{ {
if (RPC_ASSASSINATED(task)) if (RPC_ASSASSINATED(task))
return; return 0;
task->tk_action = rpc_prepare_task; task->tk_action = rpc_prepare_task;
return 1;
} }
EXPORT_SYMBOL_GPL(rpc_restart_call_prepare); EXPORT_SYMBOL_GPL(rpc_restart_call_prepare);
...@@ -769,13 +770,13 @@ EXPORT_SYMBOL_GPL(rpc_restart_call_prepare); ...@@ -769,13 +770,13 @@ EXPORT_SYMBOL_GPL(rpc_restart_call_prepare);
* Restart an (async) RPC call. Usually called from within the * Restart an (async) RPC call. Usually called from within the
* exit handler. * exit handler.
*/ */
void int
rpc_restart_call(struct rpc_task *task) rpc_restart_call(struct rpc_task *task)
{ {
if (RPC_ASSASSINATED(task)) if (RPC_ASSASSINATED(task))
return; return 0;
task->tk_action = call_start; task->tk_action = call_start;
return 1;
} }
EXPORT_SYMBOL_GPL(rpc_restart_call); EXPORT_SYMBOL_GPL(rpc_restart_call);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment