patch-2.3.1 linux/drivers/scsi/sd.c

Next file: linux/drivers/scsi/sg.c
Previous file: linux/drivers/scsi/scsi_ioctl.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.0/linux/drivers/scsi/sd.c linux/drivers/scsi/sd.c
@@ -1183,7 +1183,7 @@
 		SCpnt->sense_buffer[2] = 0;
 
 		{
-		    struct semaphore sem = MUTEX_LOCKED;
+		    DECLARE_MUTEX_LOCKED(sem);
 		    /* Mark as really busy again */
 		    SCpnt->request.rq_status = RQ_SCSI_BUSY;
 		    SCpnt->request.sem = &sem;
@@ -1221,7 +1221,7 @@
 		    SCpnt->sense_buffer[2] = 0;
 
 		    {
-		    	struct semaphore sem = MUTEX_LOCKED;
+		        DECLARE_MUTEX_LOCKED(sem);
 			/* Mark as really busy again */
 			SCpnt->request.rq_status = RQ_SCSI_BUSY;
 		    	SCpnt->request.sem = &sem;
@@ -1263,7 +1263,7 @@
 	SCpnt->sense_buffer[2] = 0;
 
 	{
-	    struct semaphore sem = MUTEX_LOCKED;
+            DECLARE_MUTEX_LOCKED(sem);
 	    /* Mark as really busy again */
 	    SCpnt->request.rq_status = RQ_SCSI_BUSY;
 	    SCpnt->request.sem = &sem;
@@ -1444,7 +1444,7 @@
 
 	/* same code as READCAPA !! */
 	{
-	    struct semaphore sem = MUTEX_LOCKED;
+            DECLARE_MUTEX_LOCKED(sem);
 	    SCpnt->request.rq_status = RQ_SCSI_BUSY;  /* Mark as really busy again */
 	    SCpnt->request.sem = &sem;
 	    scsi_do_cmd (SCpnt,

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)