[SCSI] osst: Use mutex instead of semaphore

The OnStream SCSI Tape driver uses a semaphore as mutex.  Use the mutex API
instead of the (binary) semaphore.

Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>
Reviewed-by: Satyam Sharma <satyam@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Willem Riede <wrlk@riede.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 119739502095..331b789937c4 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -3298,7 +3298,7 @@ static ssize_t osst_write(struct file * filp, const char __user * buf, size_t co
         char                * name = tape_name(STp);
 
 
-        if (down_interruptible(&STp->lock))
+        if (mutex_lock_interruptible(&STp->lock))
                 return (-ERESTARTSYS);
 
         /*
@@ -3600,7 +3600,7 @@ if (SRpnt) printk(KERN_ERR "%s:A: Not supposed to have SRpnt at line %d\n", name
 out:
         if (SRpnt != NULL) osst_release_request(SRpnt);
 
-        up(&STp->lock);
+        mutex_unlock(&STp->lock);
 
         return retval;
 }
@@ -3619,7 +3619,7 @@ static ssize_t osst_read(struct file * filp, char __user * buf, size_t count, lo
         char                * name  = tape_name(STp);
 
 
-        if (down_interruptible(&STp->lock))
+        if (mutex_lock_interruptible(&STp->lock))
                 return (-ERESTARTSYS);
 
         /*
@@ -3785,7 +3785,7 @@ static ssize_t osst_read(struct file * filp, char __user * buf, size_t count, lo
 out:
         if (SRpnt != NULL) osst_release_request(SRpnt);
 
-        up(&STp->lock);
+        mutex_unlock(&STp->lock);
 
         return retval;
 }
@@ -4852,7 +4852,7 @@ static int osst_ioctl(struct inode * inode,struct file * file,
         char                * name  = tape_name(STp);
         void        __user  * p     = (void __user *)arg;
 
-        if (down_interruptible(&STp->lock))
+        if (mutex_lock_interruptible(&STp->lock))
                 return -ERESTARTSYS;
 
 #if DEBUG
@@ -5163,14 +5163,14 @@ static int osst_ioctl(struct inode * inode,struct file * file,
         }
         if (SRpnt) osst_release_request(SRpnt);
 
-        up(&STp->lock);
+        mutex_unlock(&STp->lock);
 
         return scsi_ioctl(STp->device, cmd_in, p);
 
 out:
         if (SRpnt) osst_release_request(SRpnt);
 
-        up(&STp->lock);
+        mutex_unlock(&STp->lock);
 
         return retval;
 }
@@ -5865,7 +5865,7 @@ static int osst_probe(struct device *dev)
         tpnt->modes[2].defined = 1;
         tpnt->density_changed = tpnt->compression_changed = tpnt->blksize_changed = 0;
 
-        init_MUTEX(&tpnt->lock);
+        mutex_init(&tpnt->lock);
         osst_nr_dev++;
         write_unlock(&os_scsi_tapes_lock);