diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-08-31 18:24:08 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-09-22 23:24:56 -0400 |
| commit | 8014793b1b2869445adfe678d64cdacd10e99d53 (patch) | |
| tree | 861968eb71efbeae9918b1f407be99a5e6aaa9d3 /net | |
| parent | 297de4f65698ee1e1c75e27d57933b5fa8227e72 (diff) | |
| download | linux-8014793b1b2869445adfe678d64cdacd10e99d53.tar.gz linux-8014793b1b2869445adfe678d64cdacd10e99d53.tar.bz2 linux-8014793b1b2869445adfe678d64cdacd10e99d53.zip | |
SUNRPC: rpc_delay() should not clobber the rpc_task->tk_status
Doing so prevents stuff like call_encode() from working correctly.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/sched.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c index ecf366351bf7..6390461a9756 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -542,24 +542,20 @@ void rpc_wake_up_status(struct rpc_wait_queue *queue, int status) 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 */ -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; 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 */ |