From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Wed, 18 Jul 2007 17:24:19 +0000 (-0400)
Subject: SUNRPC: Cleanup to remove the last users of the RPC_WAITQ declaration
X-Git-Tag: v2.6.25-rc1~1146^2~85
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a4a874990cbc1bc5df6f357c4f2d043cd1923e15;p=linux-2.6-omap-h63xx.git

SUNRPC: Cleanup to remove the last users of the RPC_WAITQ declaration

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index ce6cfae91e8..40ce6f6672d 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -45,7 +45,7 @@ static void			 rpc_release_task(struct rpc_task *task);
 /*
  * RPC tasks sit here while waiting for conditions to improve.
  */
-static RPC_WAITQ(delay_queue, "delayq");
+static struct rpc_wait_queue delay_queue;
 
 /*
  * rpciod-related stuff
@@ -1059,6 +1059,11 @@ rpc_init_mempool(void)
 		goto err_nomem;
 	if (!rpciod_start())
 		goto err_nomem;
+	/*
+	 * The following is not strictly a mempool initialisation,
+	 * but there is no harm in doing it here
+	 */
+	rpc_init_wait_queue(&delay_queue, "delayq");
 	return 0;
 err_nomem:
 	rpc_destroy_mempool();