Merge v2.6.37-rc8 into powerpc/next

10 files changed, 204 insertions, 194 deletions

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index b88a244a1edd..3e57b61ca446 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -50,6 +50,7 @@
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/init.h>
+#include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/pci.h>
@@ -109,8 +110,7 @@ MODULE_PARM_DESC(mpt_debug_level, " debug level - refer to mptdebug.h \
 
 int mpt_fwfault_debug;
 EXPORT_SYMBOL(mpt_fwfault_debug);
-module_param_call(mpt_fwfault_debug, param_set_int, param_get_int,
-          &mpt_fwfault_debug, 0600);
+module_param(mpt_fwfault_debug, int, 0600);
 MODULE_PARM_DESC(mpt_fwfault_debug, "Enable detection of Firmware fault"
         " and halt Firmware on fault - (default=0)");
 
@@ -200,12 +200,9 @@ static int	mpt_host_page_access_control(MPT_ADAPTER *ioc, u8 access_control_valu
 static int      mpt_host_page_alloc(MPT_ADAPTER *ioc, pIOCInit_t ioc_init);
 
 #ifdef CONFIG_PROC_FS
-static int      procmpt_summary_read(char *buf, char **start, off_t offset,
-                                int request, int *eof, void *data);
-static int      procmpt_version_read(char *buf, char **start, off_t offset,
-                                int request, int *eof, void *data);
-static int      procmpt_iocinfo_read(char *buf, char **start, off_t offset,
-                                int request, int *eof, void *data);
+static const struct file_operations mpt_summary_proc_fops;
+static const struct file_operations mpt_version_proc_fops;
+static const struct file_operations mpt_iocinfo_proc_fops;
 #endif
 static void     mpt_get_fw_exp_ver(char *buf, MPT_ADAPTER *ioc);
 
@@ -629,6 +626,7 @@ mptbase_reply(MPT_ADAPTER *ioc, MPT_FRAME_HDR *req, MPT_FRAME_HDR *reply)
  *      mpt_register - Register protocol-specific main callback handler.
  *      @cbfunc: callback function pointer
  *      @dclass: Protocol driver's class (%MPT_DRIVER_CLASS enum value)
+ *      @func_name: call function's name
  *
  *      This routine is called by a protocol-specific driver (SCSI host,
  *      LAN, SCSI target) to register its reply callback routine.  Each
@@ -1725,7 +1723,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
         u8               pcixcmd;
         static int       mpt_ids = 0;
 #ifdef CONFIG_PROC_FS
-        struct proc_dir_entry *dent, *ent;
+        struct proc_dir_entry *dent;
 #endif
 
         ioc = kzalloc(sizeof(MPT_ADAPTER), GFP_ATOMIC);
@@ -1980,16 +1978,8 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
          */
         dent = proc_mkdir(ioc->name, mpt_proc_root_dir);
         if (dent) {
-                ent = create_proc_entry("info", S_IFREG|S_IRUGO, dent);
-                if (ent) {
-                        ent->read_proc = procmpt_iocinfo_read;
-                        ent->data = ioc;
-                }
-                ent = create_proc_entry("summary", S_IFREG|S_IRUGO, dent);
-                if (ent) {
-                        ent->read_proc = procmpt_summary_read;
-                        ent->data = ioc;
-                }
+                proc_create_data("info", S_IRUGO, dent, &mpt_iocinfo_proc_fops, ioc);
+                proc_create_data("summary", S_IRUGO, dent, &mpt_summary_proc_fops, ioc);
         }
 #endif
 
@@ -5955,8 +5945,10 @@ mpt_findImVolumes(MPT_ADAPTER *ioc)
                 goto out;
 
         mem = kmalloc(iocpage2sz, GFP_KERNEL);
-        if (!mem)
+        if (!mem) {
+                rc = -ENOMEM;
                 goto out;
+        }
 
         memcpy(mem, (u8 *)pIoc2, iocpage2sz);
         ioc->raid_data.pIocPg2 = (IOCPage2_t *) mem;
@@ -6546,20 +6538,12 @@ mpt_ioc_reset(MPT_ADAPTER *ioc, int reset_phase)
 static int
 procmpt_create(void)
 {
-        struct proc_dir_entry   *ent;
-
         mpt_proc_root_dir = proc_mkdir(MPT_PROCFS_MPTBASEDIR, NULL);
         if (mpt_proc_root_dir == NULL)
                 return -ENOTDIR;
 
-        ent = create_proc_entry("summary", S_IFREG|S_IRUGO, mpt_proc_root_dir);
-        if (ent)
-                ent->read_proc = procmpt_summary_read;
-
-        ent = create_proc_entry("version", S_IFREG|S_IRUGO, mpt_proc_root_dir);
-        if (ent)
-                ent->read_proc = procmpt_version_read;
-
+        proc_create("summary", S_IRUGO, mpt_proc_root_dir, &mpt_summary_proc_fops);
+        proc_create("version", S_IRUGO, mpt_proc_root_dir, &mpt_version_proc_fops);
         return 0;
 }
 
@@ -6578,71 +6562,47 @@ procmpt_destroy(void)
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-/**
- *      procmpt_summary_read - Handle read request of a summary file
- *      @buf: Pointer to area to write information
- *      @start: Pointer to start pointer
- *      @offset: Offset to start writing
- *      @request: Amount of read data requested
- *      @eof: Pointer to EOF integer
- *      @data: Pointer
- *
+/*
  *      Handles read request from /proc/mpt/summary or /proc/mpt/iocN/summary.
- *      Returns number of characters written to process performing the read.
  */
-static int
-procmpt_summary_read(char *buf, char **start, off_t offset, int request, int *eof, void *data)
-{
-        MPT_ADAPTER *ioc;
-        char *out = buf;
-        int len;
+static void seq_mpt_print_ioc_summary(MPT_ADAPTER *ioc, struct seq_file *m, int showlan);
 
-        if (data) {
-                int more = 0;
-
-                ioc = data;
-                mpt_print_ioc_summary(ioc, out, &more, 0, 1);
+static int mpt_summary_proc_show(struct seq_file *m, void *v)
+{
+        MPT_ADAPTER *ioc = m->private;
 
-                out += more;
+        if (ioc) {
+                seq_mpt_print_ioc_summary(ioc, m, 1);
         } else {
                 list_for_each_entry(ioc, &ioc_list, list) {
-                        int     more = 0;
-
-                        mpt_print_ioc_summary(ioc, out, &more, 0, 1);
-
-                        out += more;
-                        if ((out-buf) >= request)
-                                break;
+                        seq_mpt_print_ioc_summary(ioc, m, 1);
                 }
         }
 
-        len = out - buf;
+        return 0;
+}
 
-        MPT_PROC_READ_RETURN(buf,start,offset,request,eof,len);
+static int mpt_summary_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, mpt_summary_proc_show, PDE(inode)->data);
 }
 
-/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-/**
- *      procmpt_version_read - Handle read request from /proc/mpt/version.
- *      @buf: Pointer to area to write information
- *      @start: Pointer to start pointer
- *      @offset: Offset to start writing
- *      @request: Amount of read data requested
- *      @eof: Pointer to EOF integer
- *      @data: Pointer
- *
- *      Returns number of characters written to process performing the read.
- */
-static int
-procmpt_version_read(char *buf, char **start, off_t offset, int request, int *eof, void *data)
+static const struct file_operations mpt_summary_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = mpt_summary_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+static int mpt_version_proc_show(struct seq_file *m, void *v)
 {
         u8       cb_idx;
         int      scsi, fc, sas, lan, ctl, targ, dmp;
         char    *drvname;
-        int      len;
 
-        len = sprintf(buf, "%s-%s\n", "mptlinux", MPT_LINUX_VERSION_COMMON);
-        len += sprintf(buf+len, "  Fusion MPT base driver\n");
+        seq_printf(m, "%s-%s\n", "mptlinux", MPT_LINUX_VERSION_COMMON);
+        seq_printf(m, "  Fusion MPT base driver\n");
 
         scsi = fc = sas = lan = ctl = targ = dmp = 0;
         for (cb_idx = MPT_MAX_PROTOCOL_DRIVERS-1; cb_idx; cb_idx--) {
@@ -6670,98 +6630,97 @@ procmpt_version_read(char *buf, char **start, off_t offset, int request, int *eo
                         }
 
                         if (drvname)
-                                len += sprintf(buf+len, "  Fusion MPT %s driver\n", drvname);
+                                seq_printf(m, "  Fusion MPT %s driver\n", drvname);
                 }
         }
 
-        MPT_PROC_READ_RETURN(buf,start,offset,request,eof,len);
+        return 0;
 }
 
-/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-/**
- *      procmpt_iocinfo_read - Handle read request from /proc/mpt/iocN/info.
- *      @buf: Pointer to area to write information
- *      @start: Pointer to start pointer
- *      @offset: Offset to start writing
- *      @request: Amount of read data requested
- *      @eof: Pointer to EOF integer
- *      @data: Pointer
- *
- *      Returns number of characters written to process performing the read.
- */
-static int
-procmpt_iocinfo_read(char *buf, char **start, off_t offset, int request, int *eof, void *data)
+static int mpt_version_proc_open(struct inode *inode, struct file *file)
 {
-        MPT_ADAPTER     *ioc = data;
-        int              len;
+        return single_open(file, mpt_version_proc_show, NULL);
+}
+
+static const struct file_operations mpt_version_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = mpt_version_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
+{
+        MPT_ADAPTER     *ioc = m->private;
         char             expVer[32];
         int              sz;
         int              p;
 
         mpt_get_fw_exp_ver(expVer, ioc);
 
-        len = sprintf(buf, "%s:", ioc->name);
+        seq_printf(m, "%s:", ioc->name);
         if (ioc->facts.Flags & MPI_IOCFACTS_FLAGS_FW_DOWNLOAD_BOOT)
-                len += sprintf(buf+len, "  (f/w download boot flag set)");
+                seq_printf(m, "  (f/w download boot flag set)");
 //      if (ioc->facts.IOCExceptions & MPI_IOCFACTS_EXCEPT_CONFIG_CHECKSUM_FAIL)
-//              len += sprintf(buf+len, "  CONFIG_CHECKSUM_FAIL!");
+//              seq_printf(m, "  CONFIG_CHECKSUM_FAIL!");
 
-        len += sprintf(buf+len, "\n  ProductID = 0x%04x (%s)\n",
+        seq_printf(m, "\n  ProductID = 0x%04x (%s)\n",
                         ioc->facts.ProductID,
                         ioc->prod_name);
-        len += sprintf(buf+len, "  FWVersion = 0x%08x%s", ioc->facts.FWVersion.Word, expVer);
+        seq_printf(m, "  FWVersion = 0x%08x%s", ioc->facts.FWVersion.Word, expVer);
         if (ioc->facts.FWImageSize)
-                len += sprintf(buf+len, " (fw_size=%d)", ioc->facts.FWImageSize);
-        len += sprintf(buf+len, "\n  MsgVersion = 0x%04x\n", ioc->facts.MsgVersion);
-        len += sprintf(buf+len, "  FirstWhoInit = 0x%02x\n", ioc->FirstWhoInit);
-        len += sprintf(buf+len, "  EventState = 0x%02x\n", ioc->facts.EventState);
+                seq_printf(m, " (fw_size=%d)", ioc->facts.FWImageSize);
+        seq_printf(m, "\n  MsgVersion = 0x%04x\n", ioc->facts.MsgVersion);
+        seq_printf(m, "  FirstWhoInit = 0x%02x\n", ioc->FirstWhoInit);
+        seq_printf(m, "  EventState = 0x%02x\n", ioc->facts.EventState);
 
-        len += sprintf(buf+len, "  CurrentHostMfaHighAddr = 0x%08x\n",
+        seq_printf(m, "  CurrentHostMfaHighAddr = 0x%08x\n",
                         ioc->facts.CurrentHostMfaHighAddr);
-        len += sprintf(buf+len, "  CurrentSenseBufferHighAddr = 0x%08x\n",
+        seq_printf(m, "  CurrentSenseBufferHighAddr = 0x%08x\n",
                         ioc->facts.CurrentSenseBufferHighAddr);
 
-        len += sprintf(buf+len, "  MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
-        len += sprintf(buf+len, "  MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
+        seq_printf(m, "  MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
+        seq_printf(m, "  MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
 
-        len += sprintf(buf+len, "  RequestFrames @ 0x%p (Dma @ 0x%p)\n",
+        seq_printf(m, "  RequestFrames @ 0x%p (Dma @ 0x%p)\n",
                                         (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
         /*
          *  Rounding UP to nearest 4-kB boundary here...
          */
         sz = (ioc->req_sz * ioc->req_depth) + 128;
         sz = ((sz + 0x1000UL - 1UL) / 0x1000) * 0x1000;
-        len += sprintf(buf+len, "    {CurReqSz=%d} x {CurReqDepth=%d} = %d bytes ^= 0x%x\n",
+        seq_printf(m, "    {CurReqSz=%d} x {CurReqDepth=%d} = %d bytes ^= 0x%x\n",
                                         ioc->req_sz, ioc->req_depth, ioc->req_sz*ioc->req_depth, sz);
-        len += sprintf(buf+len, "    {MaxReqSz=%d}   {MaxReqDepth=%d}\n",
+        seq_printf(m, "    {MaxReqSz=%d}   {MaxReqDepth=%d}\n",
                                         4*ioc->facts.RequestFrameSize,
                                         ioc->facts.GlobalCredits);
 
-        len += sprintf(buf+len, "  Frames   @ 0x%p (Dma @ 0x%p)\n",
+        seq_printf(m, "  Frames   @ 0x%p (Dma @ 0x%p)\n",
                                         (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
         sz = (ioc->reply_sz * ioc->reply_depth) + 128;
-        len += sprintf(buf+len, "    {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
+        seq_printf(m, "    {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
                                         ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
-        len += sprintf(buf+len, "    {MaxRepSz=%d}   {MaxRepDepth=%d}\n",
+        seq_printf(m, "    {MaxRepSz=%d}   {MaxRepDepth=%d}\n",
                                         ioc->facts.CurReplyFrameSize,
                                         ioc->facts.ReplyQueueDepth);
 
-        len += sprintf(buf+len, "  MaxDevices = %d\n",
+        seq_printf(m, "  MaxDevices = %d\n",
                         (ioc->facts.MaxDevices==0) ? 255 : ioc->facts.MaxDevices);
-        len += sprintf(buf+len, "  MaxBuses = %d\n", ioc->facts.MaxBuses);
+        seq_printf(m, "  MaxBuses = %d\n", ioc->facts.MaxBuses);
 
         /* per-port info */
         for (p=0; p < ioc->facts.NumberOfPorts; p++) {
-                len += sprintf(buf+len, "  PortNumber = %d (of %d)\n",
+                seq_printf(m, "  PortNumber = %d (of %d)\n",
                                 p+1,
                                 ioc->facts.NumberOfPorts);
                 if (ioc->bus_type == FC) {
                         if (ioc->pfacts[p].ProtocolFlags & MPI_PORTFACTS_PROTOCOL_LAN) {
                                 u8 *a = (u8*)&ioc->lan_cnfg_page1.HardwareAddressLow;
-                                len += sprintf(buf+len, "    LanAddr = %02X:%02X:%02X:%02X:%02X:%02X\n",
+                                seq_printf(m, "    LanAddr = %02X:%02X:%02X:%02X:%02X:%02X\n",
                                                 a[5], a[4], a[3], a[2], a[1], a[0]);
                         }
-                        len += sprintf(buf+len, "    WWN = %08X%08X:%08X%08X\n",
+                        seq_printf(m, "    WWN = %08X%08X:%08X%08X\n",
                                         ioc->fc_port_page0[p].WWNN.High,
                                         ioc->fc_port_page0[p].WWNN.Low,
                                         ioc->fc_port_page0[p].WWPN.High,
@@ -6769,9 +6728,21 @@ procmpt_iocinfo_read(char *buf, char **start, off_t offset, int request, int *eo
                 }
         }
 
-        MPT_PROC_READ_RETURN(buf,start,offset,request,eof,len);
+        return 0;
+}
+
+static int mpt_iocinfo_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, mpt_iocinfo_proc_show, PDE(inode)->data);
 }
 
+static const struct file_operations mpt_iocinfo_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = mpt_iocinfo_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
 #endif          /* CONFIG_PROC_FS } */
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -6837,6 +6808,39 @@ mpt_print_ioc_summary(MPT_ADAPTER *ioc, char *buffer, int *size, int len, int sh
 
         *size = y;
 }
+
+static void seq_mpt_print_ioc_summary(MPT_ADAPTER *ioc, struct seq_file *m, int showlan)
+{
+        char expVer[32];
+
+        mpt_get_fw_exp_ver(expVer, ioc);
+
+        /*
+         *  Shorter summary of attached ioc's...
+         */
+        seq_printf(m, "%s: %s, %s%08xh%s, Ports=%d, MaxQ=%d",
+                        ioc->name,
+                        ioc->prod_name,
+                        MPT_FW_REV_MAGIC_ID_STRING,     /* "FwRev=" or somesuch */
+                        ioc->facts.FWVersion.Word,
+                        expVer,
+                        ioc->facts.NumberOfPorts,
+                        ioc->req_depth);
+
+        if (showlan && (ioc->pfacts[0].ProtocolFlags & MPI_PORTFACTS_PROTOCOL_LAN)) {
+                u8 *a = (u8*)&ioc->lan_cnfg_page1.HardwareAddressLow;
+                seq_printf(m, ", LanAddr=%02X:%02X:%02X:%02X:%02X:%02X",
+                        a[5], a[4], a[3], a[2], a[1], a[0]);
+        }
+
+        seq_printf(m, ", IRQ=%d", ioc->pci_irq);
+
+        if (!ioc->active)
+                seq_printf(m, " (disabled)");
+
+        seq_putc(m, '\n');
+}
+
 /**
  *      mpt_set_taskmgmt_in_progress_flag - set flags associated with task management
  *      @ioc: Pointer to MPT_ADAPTER structure
@@ -6922,7 +6926,6 @@ EXPORT_SYMBOL(mpt_halt_firmware);
  *      mpt_SoftResetHandler - Issues a less expensive reset
  *      @ioc: Pointer to MPT_ADAPTER structure
  *      @sleepFlag: Indicates if sleep or schedule must be called.
-
  *
  *      Returns 0 for SUCCESS or -1 if FAILED.
  *
@@ -7067,7 +7070,6 @@ mpt_SoftResetHandler(MPT_ADAPTER *ioc, int sleepFlag)
  *      mpt_Soft_Hard_ResetHandler - Try less expensive reset
  *      @ioc: Pointer to MPT_ADAPTER structure
  *      @sleepFlag: Indicates if sleep or schedule must be called.
-
  *
  *      Returns 0 for SUCCESS or -1 if FAILED.
  *      Try for softreset first, only if it fails go for expensive
@@ -8004,6 +8006,7 @@ mpt_spi_log_info(MPT_ADAPTER *ioc, u32 log_info)
  *      mpt_sas_log_info - Log information returned from SAS IOC.
  *      @ioc: Pointer to MPT_ADAPTER structure
  *      @log_info: U32 LogInfo reply word from the IOC
+ *      @cb_idx: callback function's handle
  *
  *      Refer to lsi/mpi_log_sas.h.
  **/
@@ -8050,7 +8053,7 @@ union loginfo_type {
                         code_desc = ir_code_str[sas_loginfo.dw.code];
                         if (sas_loginfo.dw.subcode >=
                             ARRAY_SIZE(raid_sub_code_str))
-                        break;
+                                break;
                         if (sas_loginfo.dw.code == 0)
                                 sub_code_desc =
                                     raid_sub_code_str[sas_loginfo.dw.subcode];
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index 23ed3dec72a5..f71f22948477 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -420,31 +420,6 @@ typedef struct _VirtDevice {
 #define MPT_TARGET_FLAGS_LED_ON         0x80
 
 /*
- *      /proc/mpt interface
- */
-typedef struct {
-        const char      *name;
-        mode_t           mode;
-        int              pad;
-        read_proc_t     *read_proc;
-        write_proc_t    *write_proc;
-} mpt_proc_entry_t;
-
-#define MPT_PROC_READ_RETURN(buf,start,offset,request,eof,len) \
-do { \
-        len -= offset;                  \
-        if (len < request) {            \
-                *eof = 1;               \
-                if (len <= 0)           \
-                        return 0;       \
-        } else                          \
-                len = request;          \
-        *start = buf + offset;          \
-        return len;                     \
-} while (0)
-
-
-/*
  *      IOCTL structure and associated defines
  */
 
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index d8ddfdf8be14..a3856ed90aef 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -54,7 +54,7 @@
 #include <linux/pci.h>
 #include <linux/delay.h>        /* for mdelay */
 #include <linux/miscdevice.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/compat.h>
 
 #include <asm/io.h>
@@ -83,6 +83,7 @@ MODULE_VERSION(my_VERSION);
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 
+static DEFINE_MUTEX(mpctl_mutex);
 static u8 mptctl_id = MPT_MAX_PROTOCOL_DRIVERS;
 static u8 mptctl_taskmgmt_id = MPT_MAX_PROTOCOL_DRIVERS;
 
@@ -601,12 +602,12 @@ mptctl_fasync(int fd, struct file *filep, int mode)
         MPT_ADAPTER     *ioc;
         int ret;
 
-        lock_kernel();
+        mutex_lock(&mpctl_mutex);
         list_for_each_entry(ioc, &ioc_list, list)
                 ioc->aen_event_read_flag=0;
 
         ret = fasync_helper(fd, filep, mode, &async_queue);
-        unlock_kernel();
+        mutex_unlock(&mpctl_mutex);
         return ret;
 }
 
@@ -698,9 +699,9 @@ static long
 mptctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
         long ret;
-        lock_kernel();
+        mutex_lock(&mpctl_mutex);
         ret = __mptctl_ioctl(file, cmd, arg);
-        unlock_kernel();
+        mutex_unlock(&mpctl_mutex);
         return ret;
 }
 
@@ -2926,7 +2927,7 @@ compat_mpt_command(struct file *filp, unsigned int cmd,
 static long compat_mpctl_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
 {
         long ret;
-        lock_kernel();
+        mutex_lock(&mpctl_mutex);
         switch (cmd) {
         case MPTIOCINFO:
         case MPTIOCINFO1:
@@ -2951,7 +2952,7 @@ static long compat_mpctl_ioctl(struct file *f, unsigned int cmd, unsigned long a
                 ret = -ENOIOCTLCMD;
                 break;
         }
-        unlock_kernel();
+        mutex_unlock(&mpctl_mutex);
         return ret;
 }
 
diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
index e15220ff52fc..d784c36707c0 100644
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
@@ -97,8 +97,7 @@ static u8	mptfcInternalCtx = MPT_MAX_PROTOCOL_DRIVERS;
 
 static int mptfc_target_alloc(struct scsi_target *starget);
 static int mptfc_slave_alloc(struct scsi_device *sdev);
-static int mptfc_qcmd(struct scsi_cmnd *SCpnt,
-                      void (*done)(struct scsi_cmnd *));
+static int mptfc_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *SCpnt);
 static void mptfc_target_destroy(struct scsi_target *starget);
 static void mptfc_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout);
 static void __devexit mptfc_remove(struct pci_dev *pdev);
@@ -650,7 +649,7 @@ mptfc_slave_alloc(struct scsi_device *sdev)
 }
 
 static int
-mptfc_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
+mptfc_qcmd_lck(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
 {
         struct mptfc_rport_info *ri;
         struct fc_rport *rport = starget_to_rport(scsi_target(SCpnt->device));
@@ -681,6 +680,8 @@ mptfc_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
         return mptscsih_qcmd(SCpnt,done);
 }
 
+static DEF_SCSI_QCMD(mptfc_qcmd)
+
 /*
  *      mptfc_display_port_link_speed - displaying link speed
  *      @ioc: Pointer to MPT_ADAPTER structure
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 83a5115f0251..d48c2c6058e1 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -1889,7 +1889,7 @@ mptsas_slave_alloc(struct scsi_device *sdev)
 }
 
 static int
-mptsas_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
+mptsas_qcmd_lck(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
 {
         MPT_SCSI_HOST   *hd;
         MPT_ADAPTER     *ioc;
@@ -1913,6 +1913,8 @@ mptsas_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
         return mptscsih_qcmd(SCpnt,done);
 }
 
+static DEF_SCSI_QCMD(mptsas_qcmd)
+
 /**
  *      mptsas_mptsas_eh_timed_out - resets the scsi_cmnd timeout
  *              if the device under question is currently in the
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
index 0e2803155ae2..6d9568d2ec59 100644
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
@@ -780,7 +780,7 @@ static int mptspi_slave_configure(struct scsi_device *sdev)
 }
 
 static int
-mptspi_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
+mptspi_qcmd_lck(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
 {
         struct _MPT_SCSI_HOST *hd = shost_priv(SCpnt->device->host);
         VirtDevice      *vdevice = SCpnt->device->hostdata;
@@ -805,6 +805,8 @@ mptspi_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
         return mptscsih_qcmd(SCpnt,done);
 }
 
+static DEF_SCSI_QCMD(mptspi_qcmd)
+
 static void mptspi_slave_destroy(struct scsi_device *sdev)
 {
         struct scsi_target *starget = scsi_target(sdev);
diff --git a/drivers/message/i2o/exec-osm.c b/drivers/message/i2o/exec-osm.c
index 06c655c55587..a3970e56ae53 100644
--- a/drivers/message/i2o/exec-osm.c
+++ b/drivers/message/i2o/exec-osm.c
@@ -389,12 +389,16 @@ static int i2o_exec_lct_notify(struct i2o_controller *c, u32 change_ind)
         dev = &c->pdev->dev;
 
         if (i2o_dma_realloc(dev, &c->dlct,
-                                        le32_to_cpu(sb->expected_lct_size)))
+                                        le32_to_cpu(sb->expected_lct_size))) {
+                mutex_unlock(&c->lct_lock);
                 return -ENOMEM;
+        }
 
         msg = i2o_msg_get_wait(c, I2O_TIMEOUT_MESSAGE_GET);
-        if (IS_ERR(msg))
+        if (IS_ERR(msg)) {
+                mutex_unlock(&c->lct_lock);
                 return PTR_ERR(msg);
+        }
 
         msg->u.head[0] = cpu_to_le32(EIGHT_WORD_MSG_SIZE | SGL_OFFSET_6);
         msg->u.head[1] = cpu_to_le32(I2O_CMD_LCT_NOTIFY << 24 | HOST_TID << 12 |
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index fc593fbab696..f87a9d405a5e 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -53,6 +53,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/i2o.h>
+#include <linux/mutex.h>
 
 #include <linux/mempool.h>
 
@@ -68,6 +69,7 @@
 #define OSM_VERSION     "1.325"
 #define OSM_DESCRIPTION "I2O Block Device OSM"
 
+static DEFINE_MUTEX(i2o_block_mutex);
 static struct i2o_driver i2o_block_driver;
 
 /* global Block OSM request mempool */
@@ -577,6 +579,7 @@ static int i2o_block_open(struct block_device *bdev, fmode_t mode)
         if (!dev->i2o_dev)
                 return -ENODEV;
 
+        mutex_lock(&i2o_block_mutex);
         if (dev->power > 0x1f)
                 i2o_block_device_power(dev, 0x02);
 
@@ -585,6 +588,7 @@ static int i2o_block_open(struct block_device *bdev, fmode_t mode)
         i2o_block_device_lock(dev->i2o_dev, -1);
 
         osm_debug("Ready.\n");
+        mutex_unlock(&i2o_block_mutex);
 
         return 0;
 };
@@ -615,6 +619,7 @@ static int i2o_block_release(struct gendisk *disk, fmode_t mode)
         if (!dev->i2o_dev)
                 return 0;
 
+        mutex_lock(&i2o_block_mutex);
         i2o_block_device_flush(dev->i2o_dev);
 
         i2o_block_device_unlock(dev->i2o_dev, -1);
@@ -625,6 +630,7 @@ static int i2o_block_release(struct gendisk *disk, fmode_t mode)
                 operation = 0x24;
 
         i2o_block_device_power(dev, operation);
+        mutex_unlock(&i2o_block_mutex);
 
         return 0;
 }
@@ -652,30 +658,40 @@ static int i2o_block_ioctl(struct block_device *bdev, fmode_t mode,
 {
         struct gendisk *disk = bdev->bd_disk;
         struct i2o_block_device *dev = disk->private_data;
+        int ret = -ENOTTY;
 
         /* Anyone capable of this syscall can do *real bad* things */
 
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
 
+        mutex_lock(&i2o_block_mutex);
         switch (cmd) {
         case BLKI2OGRSTRAT:
-                return put_user(dev->rcache, (int __user *)arg);
+                ret = put_user(dev->rcache, (int __user *)arg);
+                break;
         case BLKI2OGWSTRAT:
-                return put_user(dev->wcache, (int __user *)arg);
+                ret = put_user(dev->wcache, (int __user *)arg);
+                break;
         case BLKI2OSRSTRAT:
+                ret = -EINVAL;
                 if (arg < 0 || arg > CACHE_SMARTFETCH)
-                        return -EINVAL;
+                        break;
                 dev->rcache = arg;
+                ret = 0;
                 break;
         case BLKI2OSWSTRAT:
+                ret = -EINVAL;
                 if (arg != 0
                     && (arg < CACHE_WRITETHROUGH || arg > CACHE_SMARTBACK))
-                        return -EINVAL;
+                        break;
                 dev->wcache = arg;
+                ret = 0;
                 break;
         }
-        return -ENOTTY;
+        mutex_unlock(&i2o_block_mutex);
+
+        return ret;
 };
 
 /**
@@ -712,7 +728,7 @@ static int i2o_block_transfer(struct request *req)
 {
         struct i2o_block_device *dev = req->rq_disk->private_data;
         struct i2o_controller *c;
-        u32 tid = dev->i2o_dev->lct_data.tid;
+        u32 tid;
         struct i2o_message *msg;
         u32 *mptr;
         struct i2o_block_request *ireq = req->special;
@@ -728,6 +744,7 @@ static int i2o_block_transfer(struct request *req)
                 goto exit;
         }
 
+        tid = dev->i2o_dev->lct_data.tid;
         c = dev->i2o_dev->iop;
 
         msg = i2o_msg_get(c);
@@ -883,7 +900,7 @@ static void i2o_block_request_fn(struct request_queue *q)
                 if (!req)
                         break;
 
-                if (blk_fs_request(req)) {
+                if (req->cmd_type == REQ_TYPE_FS) {
                         struct i2o_block_delayed_request *dreq;
                         struct i2o_block_request *ireq = req->special;
                         unsigned int queue_depth;
@@ -930,7 +947,8 @@ static const struct block_device_operations i2o_block_fops = {
         .owner = THIS_MODULE,
         .open = i2o_block_open,
         .release = i2o_block_release,
-        .locked_ioctl = i2o_block_ioctl,
+        .ioctl = i2o_block_ioctl,
+        .compat_ioctl = i2o_block_ioctl,
         .getgeo = i2o_block_getgeo,
         .media_changed = i2o_block_media_changed
 };
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index c4b117f5fb70..7d3cc575c361 100644
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -31,7 +31,7 @@
  */
 
 #include <linux/miscdevice.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/compat.h>
 #include <linux/slab.h>
 
@@ -41,6 +41,7 @@
 
 #define SG_TABLESIZE            30
 
+static DEFINE_MUTEX(i2o_cfg_mutex);
 static long i2o_cfg_ioctl(struct file *, unsigned int, unsigned long);
 
 static spinlock_t i2o_config_lock;
@@ -111,11 +112,11 @@ static int i2o_cfg_gethrt(unsigned long arg)
 
         len = 8 + ((hrt->entry_len * hrt->num_entries) << 2);
 
-        /* We did a get user...so assuming mem is ok...is this bad? */
-        put_user(len, kcmd.reslen);
-        if (len > reslen)
+        if (put_user(len, kcmd.reslen))
+                ret = -EFAULT;
+        else if (len > reslen)
                 ret = -ENOBUFS;
-        if (copy_to_user(kcmd.resbuf, (void *)hrt, len))
+        else if (copy_to_user(kcmd.resbuf, (void *)hrt, len))
                 ret = -EFAULT;
 
         return ret;
@@ -147,8 +148,9 @@ static int i2o_cfg_getlct(unsigned long arg)
         lct = (i2o_lct *) c->lct;
 
         len = (unsigned int)lct->table_size << 2;
-        put_user(len, kcmd.reslen);
-        if (len > reslen)
+        if (put_user(len, kcmd.reslen))
+                ret = -EFAULT;
+        else if (len > reslen)
                 ret = -ENOBUFS;
         else if (copy_to_user(kcmd.resbuf, lct, len))
                 ret = -EFAULT;
@@ -208,8 +210,9 @@ static int i2o_cfg_parms(unsigned long arg, unsigned int type)
                 return -EAGAIN;
         }
 
-        put_user(len, kcmd.reslen);
-        if (len > reslen)
+        if (put_user(len, kcmd.reslen))
+                ret = -EFAULT;
+        else if (len > reslen)
                 ret = -ENOBUFS;
         else if (copy_to_user(kcmd.resbuf, res, len))
                 ret = -EFAULT;
@@ -739,7 +742,7 @@ static long i2o_cfg_compat_ioctl(struct file *file, unsigned cmd,
                                  unsigned long arg)
 {
         int ret;
-        lock_kernel();
+        mutex_lock(&i2o_cfg_mutex);
         switch (cmd) {
         case I2OGETIOPS:
                 ret = i2o_cfg_ioctl(file, cmd, arg);
@@ -751,7 +754,7 @@ static long i2o_cfg_compat_ioctl(struct file *file, unsigned cmd,
                 ret = -ENOIOCTLCMD;
                 break;
         }
-        unlock_kernel();
+        mutex_unlock(&i2o_cfg_mutex);
         return ret;
 }
 
@@ -979,7 +982,7 @@ static long i2o_cfg_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)
 {
         int ret;
 
-        lock_kernel();
+        mutex_lock(&i2o_cfg_mutex);
         switch (cmd) {
         case I2OGETIOPS:
                 ret = i2o_cfg_getiops(arg);
@@ -1035,7 +1038,7 @@ static long i2o_cfg_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)
                 osm_debug("unknown ioctl called!\n");
                 ret = -EINVAL;
         }
-        unlock_kernel();
+        mutex_unlock(&i2o_cfg_mutex);
         return ret;
 }
 
@@ -1049,7 +1052,7 @@ static int cfg_open(struct inode *inode, struct file *file)
         if (!tmp)
                 return -ENOMEM;
 
-        lock_kernel();
+        mutex_lock(&i2o_cfg_mutex);
         file->private_data = (void *)(i2o_cfg_info_id++);
         tmp->fp = file;
         tmp->fasync = NULL;
@@ -1063,7 +1066,7 @@ static int cfg_open(struct inode *inode, struct file *file)
         spin_lock_irqsave(&i2o_config_lock, flags);
         open_files = tmp;
         spin_unlock_irqrestore(&i2o_config_lock, flags);
-        unlock_kernel();
+        mutex_unlock(&i2o_cfg_mutex);
 
         return 0;
 }
@@ -1074,14 +1077,14 @@ static int cfg_fasync(int fd, struct file *fp, int on)
         struct i2o_cfg_info *p;
         int ret = -EBADF;
 
-        lock_kernel();
+        mutex_lock(&i2o_cfg_mutex);
         for (p = open_files; p; p = p->next)
                 if (p->q_id == id)
                         break;
 
         if (p)
                 ret = fasync_helper(fd, fp, on, &p->fasync);
-        unlock_kernel();
+        mutex_unlock(&i2o_cfg_mutex);
         return ret;
 }
 
@@ -1091,7 +1094,7 @@ static int cfg_release(struct inode *inode, struct file *file)
         struct i2o_cfg_info *p, **q;
         unsigned long flags;
 
-        lock_kernel();
+        mutex_lock(&i2o_cfg_mutex);
         spin_lock_irqsave(&i2o_config_lock, flags);
         for (q = &open_files; (p = *q) != NULL; q = &p->next) {
                 if (p->q_id == id) {
@@ -1101,7 +1104,7 @@ static int cfg_release(struct inode *inode, struct file *file)
                 }
         }
         spin_unlock_irqrestore(&i2o_config_lock, flags);
-        unlock_kernel();
+        mutex_unlock(&i2o_cfg_mutex);
 
         return 0;
 }
diff --git a/drivers/message/i2o/i2o_scsi.c b/drivers/message/i2o/i2o_scsi.c
index 3d45817e6dcd..97bdf82ec905 100644
--- a/drivers/message/i2o/i2o_scsi.c
+++ b/drivers/message/i2o/i2o_scsi.c
@@ -506,7 +506,7 @@ static struct i2o_driver i2o_scsi_driver = {
  *      Locks: takes the controller lock on error path only
  */
 
-static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt,
+static int i2o_scsi_queuecommand_lck(struct scsi_cmnd *SCpnt,
                                  void (*done) (struct scsi_cmnd *))
 {
         struct i2o_controller *c;
@@ -528,7 +528,6 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt,
          *      Do the incoming paperwork
          */
         i2o_dev = SCpnt->device->hostdata;
-        c = i2o_dev->iop;
 
         SCpnt->scsi_done = done;
 
@@ -538,7 +537,7 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt,
                 done(SCpnt);
                 goto exit;
         }
-
+        c = i2o_dev->iop;
         tid = i2o_dev->lct_data.tid;
 
         osm_debug("qcmd: Tid = %03x\n", tid);
@@ -689,7 +688,9 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt,
 
       exit:
         return rc;
-};
+}
+
+static DEF_SCSI_QCMD(i2o_scsi_queuecommand)
 
 /**
  *      i2o_scsi_abort - abort a running command