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

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

SUNRPC: Cleanup to remove the last users of the RPC_WAITQ declaration
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Trond Myklebust
1 parent 47fe064831
Showing 1 changed file with 6 additions and 1 deletions Side-by-side Diff
net/sunrpc/sched.c
@@ -45,7 +45,7 @@
 /*
  * 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 @@
 		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();
...	...	@@ -45,7 +45,7 @@
45	45	/*
46	46	* RPC tasks sit here while waiting for conditions to improve.
47	47	*/
48		-static RPC_WAITQ(delay_queue, "delayq");
	48	+static struct rpc_wait_queue delay_queue;
49	49
50	50	/*
51	51	* rpciod-related stuff
...	...	@@ -1059,6 +1059,11 @@
1059	1059	goto err_nomem;
1060	1060	if (!rpciod_start())
1061	1061	goto err_nomem;
	1062	+ /*
	1063	+ * The following is not strictly a mempool initialisation,
	1064	+ * but there is no harm in doing it here
	1065	+ */
	1066	+ rpc_init_wait_queue(&delay_queue, "delayq");
1062	1067	return 0;
1063	1068	err_nomem:
1064	1069	rpc_destroy_mempool();