patch-2.4.7 linux/drivers/scsi/gdth_proc.c

• Lines: 50
• Date: Thu Jul 19 21:11:02 2001
• Orig file: v2.4.6/linux/drivers/scsi/gdth_proc.c
• Orig date: Sat May 19 17:43:06 2001

diff -u --recursive --new-file v2.4.6/linux/drivers/scsi/gdth_proc.c linux/drivers/scsi/gdth_proc.c
@@ -3,6 +3,7 @@
  */
 
 #include "gdth_ioctl.h"
+#include <linux/completion.h>
 
 int gdth_proc_info(char *buffer,char **start,off_t offset,int length,   
                    int hostno,int inout)
@@ -1229,11 +1230,7 @@
                         char *cmnd, int timeout)
 {
     unsigned bufflen;
-#if LINUX_VERSION_CODE >= 0x020322
-    DECLARE_MUTEX_LOCKED(sem);
-#else
-    struct semaphore sem = MUTEX_LOCKED;
-#endif
+    DECLARE_COMPLETION(wait);
 
     TRACE2(("gdth_do_cmd()\n"));
     if (gdtcmd != NULL) { 
@@ -1244,7 +1241,7 @@
         bufflen = 0;
     }
     scp->request.rq_status = RQ_SCSI_BUSY;
-    scp->request.sem = &sem;
+    scp->request.waiting = &wait;
 #if LINUX_VERSION_CODE >= 0x020322
     scsi_do_cmd(scp, cmnd, gdtcmd, bufflen, gdth_scsi_done, timeout*HZ, 1);
 #else
@@ -1252,7 +1249,7 @@
     scsi_do_cmd(scp, cmnd, gdtcmd, bufflen, gdth_scsi_done, timeout*HZ, 1);
     GDTH_UNLOCK_SCSI_DOCMD();
 #endif
-    down(&sem);
+    wait_for_completion(&wait);
 }
 
 void gdth_scsi_done(Scsi_Cmnd *scp)
@@ -1261,8 +1258,8 @@
 
     scp->request.rq_status = RQ_SCSI_DONE;
 
-    if (scp->request.sem != NULL)
-        up(scp->request.sem);
+    if (scp->request.waiting != NULL)
+        complete(scp->request.waiting);
 }
 
 static int gdth_ioctl_alloc(int hanum, ushort size)