aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@linux.vnet.ibm.com>2012-02-23 13:15:26 -0500
committerNicholas Bellinger <nab@linux-iscsi.org>2012-02-25 17:37:50 -0500
commite6a8a41a30489bcb775b505f75bced550aeaa4f1 (patch)
treecd51f513c5e4996ba7942d055adb1a8224b7feef /drivers
parent99f730d88fd0a25c3e2dfc357bde4cf6b8cb5b40 (diff)
target/pscsi: fix PHV_VIRUTAL_HOST_ID typo
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/target/target_core_pscsi.c18
-rw-r--r--drivers/target/target_core_pscsi.h2
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c
index 8d4def30e9e8..94c905fcbceb 100644
--- a/drivers/target/target_core_pscsi.c
+++ b/drivers/target/target_core_pscsi.c
@@ -69,7 +69,7 @@ static int pscsi_attach_hba(struct se_hba *hba, u32 host_id)
69 return -ENOMEM; 69 return -ENOMEM;
70 } 70 }
71 phv->phv_host_id = host_id; 71 phv->phv_host_id = host_id;
72 phv->phv_mode = PHV_VIRUTAL_HOST_ID; 72 phv->phv_mode = PHV_VIRTUAL_HOST_ID;
73 73
74 hba->hba_ptr = phv; 74 hba->hba_ptr = phv;
75 75
@@ -114,7 +114,7 @@ static int pscsi_pmode_enable_hba(struct se_hba *hba, unsigned long mode_flag)
114 return 0; 114 return 0;
115 115
116 phv->phv_lld_host = NULL; 116 phv->phv_lld_host = NULL;
117 phv->phv_mode = PHV_VIRUTAL_HOST_ID; 117 phv->phv_mode = PHV_VIRTUAL_HOST_ID;
118 118
119 pr_debug("CORE_HBA[%d] - Disabled pSCSI HBA Passthrough" 119 pr_debug("CORE_HBA[%d] - Disabled pSCSI HBA Passthrough"
120 " %s\n", hba->hba_id, (sh->hostt->name) ? 120 " %s\n", hba->hba_id, (sh->hostt->name) ?
@@ -531,7 +531,7 @@ static struct se_device *pscsi_create_virtdevice(
531 return ERR_PTR(-ENODEV); 531 return ERR_PTR(-ENODEV);
532 } 532 }
533 /* 533 /*
534 * For the newer PHV_VIRUTAL_HOST_ID struct scsi_device 534 * For the newer PHV_VIRTUAL_HOST_ID struct scsi_device
535 * reference, we enforce that udev_path has been set 535 * reference, we enforce that udev_path has been set
536 */ 536 */
537 if (!(se_dev->su_dev_flags & SDF_USING_UDEV_PATH)) { 537 if (!(se_dev->su_dev_flags & SDF_USING_UDEV_PATH)) {
@@ -540,7 +540,7 @@ static struct se_device *pscsi_create_virtdevice(
540 return ERR_PTR(-EINVAL); 540 return ERR_PTR(-EINVAL);
541 } 541 }
542 /* 542 /*
543 * If no scsi_host_id= was passed for PHV_VIRUTAL_HOST_ID, 543 * If no scsi_host_id= was passed for PHV_VIRTUAL_HOST_ID,
544 * use the original TCM hba ID to reference Linux/SCSI Host No 544 * use the original TCM hba ID to reference Linux/SCSI Host No
545 * and enable for PHV_LLD_SCSI_HOST_NO mode. 545 * and enable for PHV_LLD_SCSI_HOST_NO mode.
546 */ 546 */
@@ -569,8 +569,8 @@ static struct se_device *pscsi_create_virtdevice(
569 } 569 }
570 } 570 }
571 } else { 571 } else {
572 if (phv->phv_mode == PHV_VIRUTAL_HOST_ID) { 572 if (phv->phv_mode == PHV_VIRTUAL_HOST_ID) {
573 pr_err("pSCSI: PHV_VIRUTAL_HOST_ID set while" 573 pr_err("pSCSI: PHV_VIRTUAL_HOST_ID set while"
574 " struct Scsi_Host exists\n"); 574 " struct Scsi_Host exists\n");
575 return ERR_PTR(-EEXIST); 575 return ERR_PTR(-EEXIST);
576 } 576 }
@@ -600,7 +600,7 @@ static struct se_device *pscsi_create_virtdevice(
600 } 600 }
601 601
602 if (!dev) { 602 if (!dev) {
603 if (phv->phv_mode == PHV_VIRUTAL_HOST_ID) 603 if (phv->phv_mode == PHV_VIRTUAL_HOST_ID)
604 scsi_host_put(sh); 604 scsi_host_put(sh);
605 else if (legacy_mode_enable) { 605 else if (legacy_mode_enable) {
606 pscsi_pmode_enable_hba(hba, 0); 606 pscsi_pmode_enable_hba(hba, 0);
@@ -616,7 +616,7 @@ static struct se_device *pscsi_create_virtdevice(
616 pr_err("pSCSI: Unable to locate %d:%d:%d:%d\n", sh->host_no, 616 pr_err("pSCSI: Unable to locate %d:%d:%d:%d\n", sh->host_no,
617 pdv->pdv_channel_id, pdv->pdv_target_id, pdv->pdv_lun_id); 617 pdv->pdv_channel_id, pdv->pdv_target_id, pdv->pdv_lun_id);
618 618
619 if (phv->phv_mode == PHV_VIRUTAL_HOST_ID) 619 if (phv->phv_mode == PHV_VIRTUAL_HOST_ID)
620 scsi_host_put(sh); 620 scsi_host_put(sh);
621 else if (legacy_mode_enable) { 621 else if (legacy_mode_enable) {
622 pscsi_pmode_enable_hba(hba, 0); 622 pscsi_pmode_enable_hba(hba, 0);
@@ -898,7 +898,7 @@ static ssize_t pscsi_show_configfs_dev_params(struct se_hba *hba,
898 ssize_t bl; 898 ssize_t bl;
899 int i; 899 int i;
900 900
901 if (phv->phv_mode == PHV_VIRUTAL_HOST_ID) 901 if (phv->phv_mode == PHV_VIRTUAL_HOST_ID)
902 snprintf(host_id, 16, "%d", pdv->pdv_host_id); 902 snprintf(host_id, 16, "%d", pdv->pdv_host_id);
903 else 903 else
904 snprintf(host_id, 16, "PHBA Mode"); 904 snprintf(host_id, 16, "PHBA Mode");
diff --git a/drivers/target/target_core_pscsi.h b/drivers/target/target_core_pscsi.h
index fdc17b6aefb3..43f1c419e8e5 100644
--- a/drivers/target/target_core_pscsi.h
+++ b/drivers/target/target_core_pscsi.h
@@ -49,7 +49,7 @@ struct pscsi_dev_virt {
49} ____cacheline_aligned; 49} ____cacheline_aligned;
50 50
51typedef enum phv_modes { 51typedef enum phv_modes {
52 PHV_VIRUTAL_HOST_ID, 52 PHV_VIRTUAL_HOST_ID,
53 PHV_LLD_SCSI_HOST_NO 53 PHV_LLD_SCSI_HOST_NO
54} phv_modes_t; 54} phv_modes_t;
55 55