| From 23b9600e9871865f3f19a999644c2dfc2599e164 Mon Sep 17 00:00:00 2001 |
| From: Michael Cyr <mikecyr@us.ibm.com> |
| Date: Thu, 13 Oct 2016 11:02:42 -0500 |
| Subject: [PATCH] scsi: ibmvscsis: Return correct partition name/# to client |
| |
| commit 9c93cf03d4eb3dc58931ff7cac0af9c344fe5e0b upstream. |
| |
| 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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c |
| index 34f448b4b277..6128f6cca34d 100644 |
| --- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c |
| +++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c |
| @@ -3402,6 +3402,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); |
| @@ -3617,7 +3620,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); |
| |
| -- |
| 2.12.0 |
| |
