Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / scsi / osst.c

diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 278b352ae78d0bdc6d5609f7d62bfc9893111a00..54de1d1af1a7377d9b0fba6e20753f0fd6854908 100644 (file)
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -51,7 +51,7 @@ static const char * osst_version = "0.99.4";
 #include <linux/moduleparam.h>
 #include <linux/delay.h>
 #include <linux/jiffies.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <asm/uaccess.h>
 #include <asm/dma.h>
 #include <asm/system.h>
@@ -80,6 +80,7 @@ static const char * osst_version = "0.99.4";
 #include "osst_options.h"
 #include "osst_detect.h"
 
+static DEFINE_MUTEX(osst_int_mutex);
 static int max_dev = 0;
 static int write_threshold_kbs = 0;
 static int max_sg_segs = 0;
@@ -4807,9 +4808,9 @@ static int os_scsi_tape_open(struct inode * inode, struct file * filp)
 {
        int ret;
 
-       lock_kernel();
+       mutex_lock(&osst_int_mutex);
        ret = __os_scsi_tape_open(inode, filp);
-       unlock_kernel();
+       mutex_unlock(&osst_int_mutex);
        return ret;
 }
 
@@ -4943,9 +4944,9 @@ static long osst_ioctl(struct file * file,
        char                * name  = tape_name(STp);
        void        __user  * p     = (void __user *)arg;
 
-       lock_kernel();
+       mutex_lock(&osst_int_mutex);
        if (mutex_lock_interruptible(&STp->lock)) {
-               unlock_kernel();
+               mutex_unlock(&osst_int_mutex);
                return -ERESTARTSYS;
        }
 
@@ -5260,14 +5261,14 @@ static long osst_ioctl(struct file * file,
        mutex_unlock(&STp->lock);
 
        retval = scsi_ioctl(STp->device, cmd_in, p);
-       unlock_kernel();
+       mutex_unlock(&osst_int_mutex);
        return retval;
 
 out:
        if (SRpnt) osst_release_request(SRpnt);
 
        mutex_unlock(&STp->lock);
-       unlock_kernel();
+       mutex_unlock(&osst_int_mutex);
 
        return retval;
 }