patch-2.3.1 linux/drivers/fc4/fc.c

• Lines: 36
• Date: Wed May 12 08:41:15 1999
• Orig file: v2.3.0/linux/drivers/fc4/fc.c
• Orig date: Mon Mar 15 16:11:29 1999

diff -u --recursive --new-file v2.3.0/linux/drivers/fc4/fc.c linux/drivers/fc4/fc.c
@@ -551,7 +551,7 @@
 	l->magic = LSMAGIC;
 	l->count = count;
 	FCND(("FCP Init for %d channels\n", count))
-	l->sem = MUTEX_LOCKED;
+	init_MUTEX_LOCKED(&l->sem);
 	l->timer.function = fcp_login_timeout;
 	l->timer.data = (unsigned long)l;
 	atomic_set (&l->todo, count);
@@ -672,7 +672,7 @@
 	l.count = count;
 	l.magic = LSOMAGIC;
 	FCND(("FCP Force Offline for %d channels\n", count))
-	l.sem = MUTEX_LOCKED;
+	init_MUTEX_LOCKED(&l.sem);
 	l.timer.function = fcp_login_timeout;
 	l.timer.data = (unsigned long)&l;
 	atomic_set (&l.todo, count);
@@ -933,7 +933,7 @@
 	fcp_cmd *cmd;
 	fcp_cmnd *fcmd;
 	fc_channel *fc = FC_SCMND(SCpnt);
-        struct semaphore sem = MUTEX_LOCKED;
+        DECLARE_MUTEX_LOCKED(sem);
 
 	if (!fc->rst_pkt) {
 		fc->rst_pkt = (Scsi_Cmnd *) kmalloc(sizeof(SCpnt), GFP_KERNEL);
@@ -1070,7 +1070,7 @@
 	
 	memset (&l, 0, sizeof(lse));
 	l.magic = LSEMAGIC;
-	l.sem = MUTEX_LOCKED;
+	init_MUTEX_LOCKED(&l.sem);
 	l.timer.function = fcp_login_timeout;
 	l.timer.data = (unsigned long)&l;
 	l.status = FC_STATUS_TIMED_OUT;