diff options
author | Brian King <brking@linux.vnet.ibm.com> | 2013-01-11 17:43:49 -0600 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2013-01-30 10:48:51 +1100 |
commit | b3b3b4070dc01f6b11cae6d5632cd0f428a81aab (patch) | |
tree | cfaba402ec332b5b6f587682628f80e3f53b29ed /drivers/scsi/ipr.h | |
parent | a2e49cb262208a4c3adec7788ecc1179e07dc912 (diff) | |
download | lwn-b3b3b4070dc01f6b11cae6d5632cd0f428a81aab.tar.gz lwn-b3b3b4070dc01f6b11cae6d5632cd0f428a81aab.zip |
[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>
Diffstat (limited to 'drivers/scsi/ipr.h')
-rw-r--r-- | drivers/scsi/ipr.h | 5 |
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__); \ |