Commit 29022860 authored by Michael Cyr's avatar Michael Cyr Committed by Greg Kroah-Hartman

scsi: ibmvscsis: Return correct partition name/# to client

[ Upstream commit 9c93cf03 ]
Signed-off-by: default avatarMichael Cyr <mikecyr@us.ibm.com>
Signed-off-by: default avatarBryant G. Ly <bryantly@linux.vnet.ibm.com>
Tested-by: default avatarSteven Royer <seroyer@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0ad1d766
...@@ -3387,6 +3387,9 @@ static int ibmvscsis_probe(struct vio_dev *vdev, ...@@ -3387,6 +3387,9 @@ static int ibmvscsis_probe(struct vio_dev *vdev,
strncat(vscsi->eye, vdev->name, MAX_EYE); strncat(vscsi->eye, vdev->name, MAX_EYE);
vscsi->dds.unit_id = vdev->unit_address; 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); spin_lock_bh(&ibmvscsis_dev_lock);
list_add_tail(&vscsi->list, &ibmvscsis_dev_list); list_add_tail(&vscsi->list, &ibmvscsis_dev_list);
...@@ -3603,7 +3606,7 @@ static int ibmvscsis_get_system_info(void) ...@@ -3603,7 +3606,7 @@ static int ibmvscsis_get_system_info(void)
num = of_get_property(rootdn, "ibm,partition-no", NULL); num = of_get_property(rootdn, "ibm,partition-no", NULL);
if (num) if (num)
partition_number = *num; partition_number = of_read_number(num, 1);
of_node_put(rootdn); of_node_put(rootdn);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment