aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/ibmvscsi_tgt
diff options
context:
space:
mode:
authorMichael Cyr <mikecyr@us.ibm.com>2016-10-13 11:02:42 -0500
committerMartin K. Petersen <martin.petersen@oracle.com>2016-11-08 17:29:54 -0500
commit9c93cf03d4eb3dc58931ff7cac0af9c344fe5e0b (patch)
treea9f89c40fb95404b4c78af008e391151b4fe4a26 /drivers/scsi/ibmvscsi_tgt
parentscsi: ibmvscsis: Clean up properly if target_submit_cmd/tmr fails (diff)
downloadlinux-dev-9c93cf03d4eb3dc58931ff7cac0af9c344fe5e0b.tar.xz
linux-dev-9c93cf03d4eb3dc58931ff7cac0af9c344fe5e0b.zip
scsi: ibmvscsis: Return correct partition name/# to client
Signed-off-by: Michael Cyr <mikecyr@us.ibm.com> Signed-off-by: Bryant G. Ly <bryantly@linux.vnet.ibm.com> Tested-by: Steven Royer <seroyer@linux.vnet.ibm.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/ibmvscsi_tgt')
-rw-r--r--drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
index cd9f5c734018..fe220a145079 100644
--- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
+++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
@@ -3297,6 +3297,9 @@ static int ibmvscsis_probe(struct vio_dev *vdev,
strncat(vscsi->eye, vdev->name, MAX_EYE);
vscsi->dds.unit_id = vdev->unit_address;
+ strncpy(vscsi->dds.partition_name, partition_name,
+ sizeof(vscsi->dds.partition_name));
+ vscsi->dds.partition_num = partition_number;
spin_lock_bh(&ibmvscsis_dev_lock);
list_add_tail(&vscsi->list, &ibmvscsis_dev_list);
@@ -3495,7 +3498,7 @@ static int ibmvscsis_get_system_info(void)
num = of_get_property(rootdn, "ibm,partition-no", NULL);
if (num)
- partition_number = *num;
+ partition_number = of_read_number(num, 1);
of_node_put(rootdn);