Commit 8014793b authored by Trond Myklebust's avatar Trond Myklebust

SUNRPC: rpc_delay() should not clobber the rpc_task->tk_status

Doing so prevents stuff like call_encode() from working correctly.
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 297de4f6
...@@ -542,24 +542,20 @@ void rpc_wake_up_status(struct rpc_wait_queue *queue, int status) ...@@ -542,24 +542,20 @@ void rpc_wake_up_status(struct rpc_wait_queue *queue, int status)
spin_unlock_bh(&queue->lock); spin_unlock_bh(&queue->lock);
} }
static void __rpc_atrun(struct rpc_task *task)
{
rpc_wake_up_task(task);
}
/* /*
* Run a task at a later time * Run a task at a later time
*/ */
static void __rpc_atrun(struct rpc_task *); void rpc_delay(struct rpc_task *task, unsigned long delay)
void
rpc_delay(struct rpc_task *task, unsigned long delay)
{ {
task->tk_timeout = delay; task->tk_timeout = delay;
rpc_sleep_on(&delay_queue, task, NULL, __rpc_atrun); rpc_sleep_on(&delay_queue, task, NULL, __rpc_atrun);
} }
static void
__rpc_atrun(struct rpc_task *task)
{
task->tk_status = 0;
rpc_wake_up_task(task);
}
/* /*
* Helper to call task->tk_ops->rpc_call_prepare * Helper to call task->tk_ops->rpc_call_prepare
*/ */
......
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