patch-2.3.1 linux/drivers/scsi/scsi.h

• Lines: 18
• Date: Thu May 13 14:43:05 1999
• Orig file: v2.3.0/linux/drivers/scsi/scsi.h
• Orig date: Tue May 11 13:04:47 1999

diff -u --recursive --new-file v2.3.0/linux/drivers/scsi/scsi.h linux/drivers/scsi/scsi.h
@@ -417,7 +417,7 @@
      */
     struct scsi_device * next;      /* Used for linked list */
     struct scsi_device * prev;      /* Used for linked list */
-    struct wait_queue  * device_wait;/* Used to wait if
+    wait_queue_head_t device_wait;/* Used to wait if
                                                       device is busy */
     struct Scsi_Host   * host;
     volatile unsigned short device_busy;   /* commands actually active on low-level */
@@ -711,7 +711,7 @@
 
 #define SCSI_SLEEP(QUEUE, CONDITION) {		    \
     if (CONDITION) {			            \
-	struct wait_queue wait = { current, NULL};  \
+	DECLARE_WAITQUEUE(wait, current);	    \
 	add_wait_queue(QUEUE, &wait);		    \
 	for(;;) {			            \
 	current->state = TASK_UNINTERRUPTIBLE;	    \