[SCSI] ipr: Resource path error logging cleanup

The resource path as displayed by the ipr driver is the
location string identifying a location on the SAS fabric.
This patch adds the SCSI host number such that error logs
can be more easily correlated in multiple adapter configurations.

Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: Wen Xiong <wenxiong@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index 87762fc404c1..449309a21107 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -409,7 +409,7 @@ struct ipr_config_table_entry64 {
         __be64 dev_id;
         __be64 lun;
         __be64 lun_wwn[2];
-#define IPR_MAX_RES_PATH_LENGTH         24
+#define IPR_MAX_RES_PATH_LENGTH         48
         __be64 res_path;
         struct ipr_std_inq_data std_inq_data;
         u8 reserved2[4];
@@ -1722,7 +1722,8 @@ struct ipr_ucode_image_header {
         if (ipr_is_device(hostrcb)) {                                   \
                 if ((hostrcb)->ioa_cfg->sis64) {                        \
                         printk(KERN_ERR IPR_NAME ": %s: " fmt,          \
-                                ipr_format_res_path(hostrcb->hcam.u.error64.fd_res_path, \
+                                ipr_format_res_path(hostrcb->ioa_cfg,   \
+                                        hostrcb->hcam.u.error64.fd_res_path, \
                                         hostrcb->rp_buffer,             \
                                         sizeof(hostrcb->rp_buffer)),    \
                                 __VA_ARGS__);                           \