From cf510001addeaa330abc24a32c066f38be78e71a Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Thu, 31 Aug 2006 18:24:08 -0400 Subject: [PATCH] --- yaml --- r: 34803 b: refs/heads/master c: 8014793b1b2869445adfe678d64cdacd10e99d53 h: refs/heads/master i: 34801: 6bfe43cdfd157e8f393b9a7bd0a0052f0a0280d0 34799: b2e303820f0b0154e834b9d0bfe319fd5869a6f1 v: v3 --- [refs] | 2 +- trunk/net/sunrpc/sched.c | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 3db6067e2f2c..3a2f1caca1ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 297de4f65698ee1e1c75e27d57933b5fa8227e72 +refs/heads/master: 8014793b1b2869445adfe678d64cdacd10e99d53 diff --git a/trunk/net/sunrpc/sched.c b/trunk/net/sunrpc/sched.c index ecf366351bf7..6390461a9756 100644 --- a/trunk/net/sunrpc/sched.c +++ b/trunk/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 */