@@ -968,15 +968,13 @@ static int nfs41_sequence_process(struct rpc_task *task,
retry_new_seq:
++slot->seq_nr;
retry_nowait:
- if (rpc_restart_call_prepare(task)) {
- nfs41_sequence_free_slot(res);
- task->tk_status = 0;
- ret = 0;
- }
+ rpc_restart_call_prepare(task);
+ nfs41_sequence_free_slot(res);
+ task->tk_status = 0;
+ ret = 0;
goto out;
out_retry:
- if (!rpc_restart_call(task))
- goto out;
+ rpc_restart_call(task);
rpc_delay(task, NFS4_POLL_RETRY_MAX);
return 0;
}
@@ -1404,9 +1404,7 @@ static bool nfsd4_cb_sequence_done(struct rpc_task *task, struct nfsd4_callback
case -NFS4ERR_DELAY:
cb->cb_seq_status = 1;
nfsd41_cb_release_slot(cb);
- if (!rpc_restart_call(task))
- goto out;
-
+ rpc_restart_call(task);
rpc_delay(task, 2 * HZ);
return false;
default:
@@ -1414,7 +1412,6 @@ static bool nfsd4_cb_sequence_done(struct rpc_task *task, struct nfsd4_callback
}
trace_nfsd_cb_free_slot(task, cb);
nfsd41_cb_release_slot(cb);
-out:
return ret;
need_restart:
if (!test_bit(NFSD4_CLIENT_CB_KILL, &clp->cl_flags)) {
@@ -213,8 +213,8 @@ int rpc_call_sync(struct rpc_clnt *clnt,
const struct rpc_message *msg, int flags);
struct rpc_task *rpc_call_null(struct rpc_clnt *clnt, struct rpc_cred *cred,
int flags);
-int rpc_restart_call_prepare(struct rpc_task *);
-int rpc_restart_call(struct rpc_task *);
+void rpc_restart_call_prepare(struct rpc_task *task);
+void rpc_restart_call(struct rpc_task *task);
void rpc_setbufsize(struct rpc_clnt *, unsigned int, unsigned int);
struct net * rpc_net_ns(struct rpc_clnt *);
size_t rpc_max_payload(struct rpc_clnt *);
@@ -1670,20 +1670,19 @@ void rpc_force_rebind(struct rpc_clnt *clnt)
}
EXPORT_SYMBOL_GPL(rpc_force_rebind);
-static int
+static void
__rpc_restart_call(struct rpc_task *task, void (*action)(struct rpc_task *))
{
task->tk_status = 0;
task->tk_rpc_status = 0;
task->tk_action = action;
- return 1;
}
/*
* Restart an (async) RPC call. Usually called from within the
* exit handler.
*/
-int
+void
rpc_restart_call(struct rpc_task *task)
{
return __rpc_restart_call(task, call_start);
@@ -1694,7 +1693,7 @@ EXPORT_SYMBOL_GPL(rpc_restart_call);
* Restart an (async) RPC call from the call_prepare state.
* Usually called from within the exit handler.
*/
-int
+void
rpc_restart_call_prepare(struct rpc_task *task)
{
if (task->tk_ops->rpc_call_prepare != NULL)
These functions always return 1. Make them void return and fix up the places that check the return code. Signed-off-by: Jeff Layton <jlayton@kernel.org> --- fs/nfs/nfs4proc.c | 12 +++++------- fs/nfsd/nfs4callback.c | 5 +---- include/linux/sunrpc/clnt.h | 4 ++-- net/sunrpc/clnt.c | 7 +++---- 4 files changed, 11 insertions(+), 17 deletions(-)