patch-2.3.34 linux/drivers/scsi/sg.c

• Lines: 54
• Date: Sat Dec 18 15:36:40 1999
• Orig file: v2.3.33/linux/drivers/scsi/sg.c
• Orig date: Wed Dec 15 10:43:16 1999

diff -u --recursive --new-file v2.3.33/linux/drivers/scsi/sg.c linux/drivers/scsi/sg.c
@@ -65,6 +65,7 @@
 #include <scsi/scsi_ioctl.h>
 #include <scsi/sg.h>
 
+static spinlock_t sg_request_lock = SPIN_LOCK_UNLOCKED;
 
 int sg_big_buff = SG_DEF_RESERVED_SIZE; /* sg_big_buff is ro through sysctl */
 /* N.B. This global is here to keep existing software happy. It now holds
@@ -432,9 +433,13 @@
     }
 /*  SCSI_LOG_TIMEOUT(7, printk("sg_write: allocating device\n")); */
     if (! (SCpnt = scsi_allocate_device(sdp->device, 
-                                        !(filp->f_flags & O_NONBLOCK)))) 
-    {
+                                        !(filp->f_flags & O_NONBLOCK), 
+					TRUE))) {
         sg_finish_rem_req(srp, NULL, 0);
+        if( signal_pending(current) )
+        {
+                return -EINTR;
+        }
         return -EAGAIN;   /* No available command blocks at the moment */
     }
 /*  SCSI_LOG_TIMEOUT(7, printk("sg_write: device allocated\n")); */
@@ -1043,7 +1048,7 @@
             continue;   /* dirty but lowers nesting */
         if (sdp->headfp) {
 /* Need to stop sg_command_done() playing with this list during this loop */
-            spin_lock_irqsave(&io_request_lock, flags);
+            spin_lock_irqsave(&sg_request_lock, flags);
             sfp = sdp->headfp;
             while (sfp) {
                 srp = sfp->headrp;
@@ -1054,7 +1059,7 @@
                 }
                 sfp = sfp->nextfp;
             }
-            spin_unlock_irqrestore(&io_request_lock, flags);
+            spin_unlock_irqrestore(&sg_request_lock, flags);
     SCSI_LOG_TIMEOUT(3, printk("sg_detach: dev=%d, dirty, sleep(3)\n", k));
             scsi_sleep(3); /* sleep 3 jiffies, hoping for timeout to go off */
         }
@@ -1114,9 +1119,9 @@
         scsi_add_timer(scpnt, scpnt->timeout_per_command,
                        scsi_old_times_out);
 #else
-    spin_unlock_irq(&io_request_lock);
+    spin_unlock_irq(&sg_request_lock);
     scsi_sleep(HZ); /* just sleep 1 second and hope ... */
-    spin_lock_irq(&io_request_lock);
+    spin_lock_irq(&sg_request_lock);
 #endif
 }