2 files changed, 10 insertions, 9 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);
 
diff --git a/drivers/scsi/osst.h b/drivers/scsi/osst.h
index 2cc7b5a1606a..5aa22740b5df 100644
--- a/drivers/scsi/osst.h
+++ b/drivers/scsi/osst.h
@@ -4,6 +4,7 @@
 
 #include <asm/byteorder.h>
 #include <linux/completion.h>
+#include <linux/mutex.h>
 
 /*      FIXME - rename and use the following two types or delete them!
  *              and the types really should go to st.h anyway...
@@ -532,7 +533,7 @@ struct osst_tape {
   struct scsi_driver *driver;
   unsigned capacity;
   struct scsi_device *device;
-  struct semaphore lock;       /* for serialization */
+  struct mutex lock;           /* for serialization */
   struct completion wait;      /* for SCSI commands */
   struct osst_buffer * buffer;