diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-04 09:58:30 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-04 09:58:30 +1000 |
| commit | 50625f2dbc3022842ced19e04b49ff5a0cfeeed9 (patch) | |
| tree | eb65b14d0114f070c9dbf58c06afdc8c65dcfd7b /net | |
| parent | 6470302833cb4fdd7b6fac6e1edb3190e15c9350 (diff) | |
| parent | 4770822f16154559c8168c1b7171c9941a7c4d89 (diff) | |
Merge commit 'nfs/linux-next'
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/clnt.c | 13 | ||||
| -rw-r--r-- | net/sunrpc/sched.c | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 5abab094441f..d00e8135f866 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -695,6 +695,19 @@ 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. + */ +void +rpc_restart_call_prepare(struct rpc_task *task) +{ + if (RPC_ASSASSINATED(task)) + return; + task->tk_action = rpc_prepare_task; +} +EXPORT_SYMBOL_GPL(rpc_restart_call_prepare); + +/* * Restart an (async) RPC call. Usually called from within the * exit handler. */ diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c index ff50a0546865..1102ce1251f7 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -569,7 +569,7 @@ EXPORT_SYMBOL_GPL(rpc_delay); /* * Helper to call task->tk_ops->rpc_call_prepare */ -static void rpc_prepare_task(struct rpc_task *task) +void rpc_prepare_task(struct rpc_task *task) { task->tk_ops->rpc_call_prepare(task, task->tk_calldata); } |