patch-2.3.1 linux/fs/coda/upcall.c

• Lines: 18
• Date: Tue May 11 23:04:59 1999
• Orig file: v2.3.0/linux/fs/coda/upcall.c
• Orig date: Wed Mar 10 17:03:52 1999

diff -u --recursive --new-file v2.3.0/linux/fs/coda/upcall.c linux/fs/coda/upcall.c
@@ -587,7 +587,7 @@
 
 static inline unsigned long coda_waitfor_upcall(struct upc_req *vmp)
 {
-	struct wait_queue	wait = { current, NULL };
+	DECLARE_WAITQUEUE(wait, current);
 	unsigned long posttime;
 
 	vmp->uc_posttime = jiffies;
@@ -662,7 +662,7 @@
 	req->uc_outSize = *outSize ? *outSize : inSize;
 	req->uc_opcode = ((union inputArgs *)buffer)->ih.opcode;
 	req->uc_unique = ++vcommp->vc_seq;
-        req->uc_sleep = NULL;
+	init_waitqueue_head(&req->uc_sleep);
 	
 	/* Fill in the common input args. */
 	((union inputArgs *)buffer)->ih.unique = req->uc_unique;