1 files changed, 16 insertions, 13 deletions

diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index ffc1edf5e80d..b4f6c9a84e71 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -49,7 +49,6 @@ MODULE_DESCRIPTION("Adaptec I2O RAID Driver");
 #include <linux/kernel.h>       /* for printk */
 #include <linux/sched.h>
 #include <linux/reboot.h>
-#include <linux/smp_lock.h>
 #include <linux/spinlock.h>
 #include <linux/dma-mapping.h>
 
@@ -76,6 +75,7 @@ MODULE_DESCRIPTION("Adaptec I2O RAID Driver");
  * Needed for our management apps
  *============================================================================
  */
+static DEFINE_MUTEX(adpt_mutex);
 static dpt_sig_S DPTI_sig = {
         {'d', 'P', 't', 'S', 'i', 'G'}, SIG_VERSION,
 #ifdef __i386__
@@ -126,6 +126,7 @@ static const struct file_operations adpt_fops = {
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = compat_adpt_ioctl,
 #endif
+        .llseek         = noop_llseek,
 };
 
 /* Structures and definitions for synchronous message posting.
@@ -422,7 +423,7 @@ static int adpt_slave_configure(struct scsi_device * device)
         return 0;
 }
 
-static int adpt_queue(struct scsi_cmnd * cmd, void (*done) (struct scsi_cmnd *))
+static int adpt_queue_lck(struct scsi_cmnd * cmd, void (*done) (struct scsi_cmnd *))
 {
         adpt_hba* pHba = NULL;
         struct adpt_device* pDev = NULL;        /* dpt per device information */
@@ -490,6 +491,8 @@ static int adpt_queue(struct scsi_cmnd * cmd, void (*done) (struct scsi_cmnd *))
         return adpt_scsi_to_i2o(pHba, cmd, pDev);
 }
 
+static DEF_SCSI_QCMD(adpt_queue)
+
 static int adpt_bios_param(struct scsi_device *sdev, struct block_device *dev,
                 sector_t capacity, int geom[])
 {
@@ -777,7 +780,7 @@ static int adpt_abort(struct scsi_cmnd * cmd)
                 return FAILED;
         }
         pHba = (adpt_hba*) cmd->device->host->hostdata[0];
-        printk(KERN_INFO"%s: Trying to Abort cmd=%ld\n",pHba->name, cmd->serial_number);
+        printk(KERN_INFO"%s: Trying to Abort\n",pHba->name);
         if ((dptdevice = (void*) (cmd->device->hostdata)) == NULL) {
                 printk(KERN_ERR "%s: Unable to abort: No device in cmnd\n",pHba->name);
                 return FAILED;
@@ -799,10 +802,10 @@ static int adpt_abort(struct scsi_cmnd * cmd)
                         printk(KERN_INFO"%s: Abort cmd not supported\n",pHba->name);
                         return FAILED;
                 }
-                printk(KERN_INFO"%s: Abort cmd=%ld failed.\n",pHba->name, cmd->serial_number);
+                printk(KERN_INFO"%s: Abort failed.\n",pHba->name);
                 return FAILED;
         } 
-        printk(KERN_INFO"%s: Abort cmd=%ld complete.\n",pHba->name, cmd->serial_number);
+        printk(KERN_INFO"%s: Abort complete.\n",pHba->name);
         return SUCCESS;
 }
 
@@ -1732,12 +1735,12 @@ static int adpt_open(struct inode *inode, struct file *file)
         int minor;
         adpt_hba* pHba;
 
-        lock_kernel();
+        mutex_lock(&adpt_mutex);
         //TODO check for root access
         //
         minor = iminor(inode);
         if (minor >= hba_count) {
-                unlock_kernel();
+                mutex_unlock(&adpt_mutex);
                 return -ENXIO;
         }
         mutex_lock(&adpt_configuration_lock);
@@ -1748,7 +1751,7 @@ static int adpt_open(struct inode *inode, struct file *file)
         }
         if (pHba == NULL) {
                 mutex_unlock(&adpt_configuration_lock);
-                unlock_kernel();
+                mutex_unlock(&adpt_mutex);
                 return -ENXIO;
         }
 
@@ -1759,7 +1762,7 @@ static int adpt_open(struct inode *inode, struct file *file)
 
         pHba->in_use = 1;
         mutex_unlock(&adpt_configuration_lock);
-        unlock_kernel();
+        mutex_unlock(&adpt_mutex);
 
         return 0;
 }
@@ -2160,9 +2163,9 @@ static long adpt_unlocked_ioctl(struct file *file, uint cmd, ulong arg)
  
         inode = file->f_dentry->d_inode;
  
-        lock_kernel();
+        mutex_lock(&adpt_mutex);
         ret = adpt_ioctl(inode, file, cmd, arg);
-        unlock_kernel();
+        mutex_unlock(&adpt_mutex);
 
         return ret;
 }
@@ -2176,7 +2179,7 @@ static long compat_adpt_ioctl(struct file *file,
  
         inode = file->f_dentry->d_inode;
  
-        lock_kernel();
+        mutex_lock(&adpt_mutex);
  
         switch(cmd) {
                 case DPT_SIGNATURE:
@@ -2194,7 +2197,7 @@ static long compat_adpt_ioctl(struct file *file,
                         ret =  -ENOIOCTLCMD;
         }
  
-        unlock_kernel();
+        mutex_unlock(&adpt_mutex);
  
         return ret;
 }