patch-2.3.1 linux/net/sunrpc/sched.c

• Lines: 39
• Date: Tue May 11 14:37:40 1999
• Orig file: v2.3.0/linux/net/sunrpc/sched.c
• Orig date: Fri May 7 11:19:11 1999

diff -u --recursive --new-file v2.3.0/linux/net/sunrpc/sched.c linux/net/sunrpc/sched.c
@@ -60,9 +60,9 @@
 /*
  * rpciod-related stuff
  */
-static struct wait_queue *	rpciod_idle = NULL;
-static struct wait_queue *	rpciod_killer = NULL;
-static struct semaphore		rpciod_sema = MUTEX;
+static DECLARE_WAIT_QUEUE_HEAD(rpciod_idle);
+static DECLARE_WAIT_QUEUE_HEAD(rpciod_killer);
+static DECLARE_MUTEX(rpciod_sema);
 static unsigned int		rpciod_users = 0;
 static pid_t			rpciod_pid = 0;
 static int			rpc_inhibit = 0;
@@ -616,6 +616,7 @@
 	task->tk_client = clnt;
 	task->tk_flags  = RPC_TASK_RUNNING | flags;
 	task->tk_exit   = callback;
+	init_waitqueue_head(&task->tk_wait);
 	if (current->uid != current->fsuid || current->gid != current->fsgid)
 		task->tk_flags |= RPC_TASK_SETUID;
 
@@ -800,7 +801,7 @@
 	rpc_inhibit--;
 }
 
-static struct semaphore rpciod_running = MUTEX_LOCKED;
+static DECLARE_MUTEX_LOCKED(rpciod_running);
 
 /*
  * This is the rpciod kernel thread
@@ -808,7 +809,7 @@
 static int
 rpciod(void *ptr)
 {
-	struct wait_queue **assassin = (struct wait_queue **) ptr;
+	wait_queue_head_t *assassin = (wait_queue_head_t*) ptr;
 	unsigned long	oldflags;
 	int		rounds = 0;