Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (32 commits)
  [SCSI] aacraid: prevent panic on adapter resource failure
  [SCSI] aha152x: use data accessors and !use_sg cleanup
  [SCSI] aha152x: Fix check_condition code-path
  [SCSI] aha152x: Clean Reset path
  [SCSI] aha152x: preliminary fixes and some comments
  [SCSI] aha152x: use bounce buffer
  [SCSI] aha152x: fix debug mode symbol conflict
  [SCSI] sd: disentangle barriers in SCSI
  [SCSI] lpfc : scsi command accessor fix for 8.2.2
  [SCSI] qlogicpti: Some cosmetic changes
  [SCSI] lpfc 8.2.2 : Change version number to 8.2.2
  [SCSI] lpfc 8.2.2 : Style cleanups
  [SCSI] lpfc 8.2.2 : Miscellaneous Bug Fixes
  [SCSI] lpfc 8.2.2 : Miscellaneous management and logging mods
  [SCSI] lpfc 8.2.2 : Rework the lpfc_printf_log() macro
  [SCSI] lpfc 8.2.2 : Attribute and Parameter splits for vport and physical port
  [SCSI] lpfc 8.2.2 : Fix locking around HBA's port_list
  [SCSI] lpfc 8.2.2 : Error messages and debugfs updates
  [SCSI] initialize shost_data to zero
  [SCSI] mptsas: add SMP passthrough support via bsg
  ...

1 files changed, 11 insertions, 28 deletions

diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 5870866abc99..5ecc63d1b436 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -393,12 +393,6 @@ static int map_sg_data(struct scsi_cmnd *cmd,
                 return 1;
         else if (sg_mapped < 0)
                 return 0;
-        else if (sg_mapped > SG_ALL) {
-                printk(KERN_ERR
-                       "ibmvscsi: More than %d mapped sg entries, got %d\n",
-                       SG_ALL, sg_mapped);
-                return 0;
-        }
 
         set_srp_direction(cmd, srp_cmd, sg_mapped);
 
@@ -708,8 +702,7 @@ static int ibmvscsi_queuecommand(struct scsi_cmnd *cmnd,
         struct srp_cmd *srp_cmd;
         struct srp_event_struct *evt_struct;
         struct srp_indirect_buf *indirect;
-        struct ibmvscsi_host_data *hostdata =
-                (struct ibmvscsi_host_data *)&cmnd->device->host->hostdata;
+        struct ibmvscsi_host_data *hostdata = shost_priv(cmnd->device->host);
         u16 lun = lun_from_dev(cmnd->device);
         u8 out_fmt, in_fmt;
 
@@ -960,8 +953,7 @@ static void sync_completion(struct srp_event_struct *evt_struct)
  */
 static int ibmvscsi_eh_abort_handler(struct scsi_cmnd *cmd)
 {
-        struct ibmvscsi_host_data *hostdata =
-            (struct ibmvscsi_host_data *)cmd->device->host->hostdata;
+        struct ibmvscsi_host_data *hostdata = shost_priv(cmd->device->host);
         struct srp_tsk_mgmt *tsk_mgmt;
         struct srp_event_struct *evt;
         struct srp_event_struct *tmp_evt, *found_evt;
@@ -1084,9 +1076,7 @@ static int ibmvscsi_eh_abort_handler(struct scsi_cmnd *cmd)
  */
 static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
 {
-        struct ibmvscsi_host_data *hostdata =
-            (struct ibmvscsi_host_data *)cmd->device->host->hostdata;
-
+        struct ibmvscsi_host_data *hostdata = shost_priv(cmd->device->host);
         struct srp_tsk_mgmt *tsk_mgmt;
         struct srp_event_struct *evt;
         struct srp_event_struct *tmp_evt, *pos;
@@ -1183,8 +1173,7 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
 static int ibmvscsi_eh_host_reset_handler(struct scsi_cmnd *cmd)
 {
         unsigned long wait_switch = 0;
-        struct ibmvscsi_host_data *hostdata =
-                (struct ibmvscsi_host_data *)cmd->device->host->hostdata;
+        struct ibmvscsi_host_data *hostdata = shost_priv(cmd->device->host);
 
         dev_err(hostdata->dev, "Resetting connection due to error recovery\n");
 
@@ -1412,8 +1401,7 @@ static int ibmvscsi_change_queue_depth(struct scsi_device *sdev, int qdepth)
 static ssize_t show_host_srp_version(struct class_device *class_dev, char *buf)
 {
         struct Scsi_Host *shost = class_to_shost(class_dev);
-        struct ibmvscsi_host_data *hostdata =
-            (struct ibmvscsi_host_data *)shost->hostdata;
+        struct ibmvscsi_host_data *hostdata = shost_priv(shost);
         int len;
 
         len = snprintf(buf, PAGE_SIZE, "%s\n",
@@ -1433,8 +1421,7 @@ static ssize_t show_host_partition_name(struct class_device *class_dev,
                                         char *buf)
 {
         struct Scsi_Host *shost = class_to_shost(class_dev);
-        struct ibmvscsi_host_data *hostdata =
-            (struct ibmvscsi_host_data *)shost->hostdata;
+        struct ibmvscsi_host_data *hostdata = shost_priv(shost);
         int len;
 
         len = snprintf(buf, PAGE_SIZE, "%s\n",
@@ -1454,8 +1441,7 @@ static ssize_t show_host_partition_number(struct class_device *class_dev,
                                           char *buf)
 {
         struct Scsi_Host *shost = class_to_shost(class_dev);
-        struct ibmvscsi_host_data *hostdata =
-            (struct ibmvscsi_host_data *)shost->hostdata;
+        struct ibmvscsi_host_data *hostdata = shost_priv(shost);
         int len;
 
         len = snprintf(buf, PAGE_SIZE, "%d\n",
@@ -1474,8 +1460,7 @@ static struct class_device_attribute ibmvscsi_host_partition_number = {
 static ssize_t show_host_mad_version(struct class_device *class_dev, char *buf)
 {
         struct Scsi_Host *shost = class_to_shost(class_dev);
-        struct ibmvscsi_host_data *hostdata =
-            (struct ibmvscsi_host_data *)shost->hostdata;
+        struct ibmvscsi_host_data *hostdata = shost_priv(shost);
         int len;
 
         len = snprintf(buf, PAGE_SIZE, "%d\n",
@@ -1494,8 +1479,7 @@ static struct class_device_attribute ibmvscsi_host_mad_version = {
 static ssize_t show_host_os_type(struct class_device *class_dev, char *buf)
 {
         struct Scsi_Host *shost = class_to_shost(class_dev);
-        struct ibmvscsi_host_data *hostdata =
-            (struct ibmvscsi_host_data *)shost->hostdata;
+        struct ibmvscsi_host_data *hostdata = shost_priv(shost);
         int len;
 
         len = snprintf(buf, PAGE_SIZE, "%d\n", hostdata->madapter_info.os_type);
@@ -1513,8 +1497,7 @@ static struct class_device_attribute ibmvscsi_host_os_type = {
 static ssize_t show_host_config(struct class_device *class_dev, char *buf)
 {
         struct Scsi_Host *shost = class_to_shost(class_dev);
-        struct ibmvscsi_host_data *hostdata =
-            (struct ibmvscsi_host_data *)shost->hostdata;
+        struct ibmvscsi_host_data *hostdata = shost_priv(shost);
 
         /* returns null-terminated host config data */
         if (ibmvscsi_do_host_config(hostdata, buf, PAGE_SIZE) == 0)
@@ -1582,7 +1565,7 @@ static int ibmvscsi_probe(struct vio_dev *vdev, const struct vio_device_id *id)
                 goto scsi_host_alloc_failed;
         }
 
-        hostdata = (struct ibmvscsi_host_data *)host->hostdata;
+        hostdata = shost_priv(host);
         memset(hostdata, 0x00, sizeof(*hostdata));
         INIT_LIST_HEAD(&hostdata->sent);
         hostdata->host = host;