Skip to content

Commit

Permalink
target/pscsi: fix PHV_VIRUTAL_HOST_ID typo
Browse files Browse the repository at this point in the history 
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
  • Loading branch information
Stefan Hajnoczi authored and Nicholas Bellinger committed Feb 25, 2012
1 parent 99f730d commit e6a8a41
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
18 changes: 9 additions & 9 deletions drivers/target/target_core_pscsi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ static int pscsi_attach_hba(struct se_hba *hba, u32 host_id)
return -ENOMEM;
}
phv->phv_host_id = host_id;
phv->phv_mode = PHV_VIRUTAL_HOST_ID;
phv->phv_mode = PHV_VIRTUAL_HOST_ID;

hba->hba_ptr = phv;

Expand Down Expand Up @@ -114,7 +114,7 @@ static int pscsi_pmode_enable_hba(struct se_hba *hba, unsigned long mode_flag)
return 0;

phv->phv_lld_host = NULL;
phv->phv_mode = PHV_VIRUTAL_HOST_ID;
phv->phv_mode = PHV_VIRTUAL_HOST_ID;

pr_debug("CORE_HBA[%d] - Disabled pSCSI HBA Passthrough"
" %s\n", hba->hba_id, (sh->hostt->name) ?
Expand Down Expand Up @@ -531,7 +531,7 @@ static struct se_device *pscsi_create_virtdevice(
return ERR_PTR(-ENODEV);
}
/*
* For the newer PHV_VIRUTAL_HOST_ID struct scsi_device
* For the newer PHV_VIRTUAL_HOST_ID struct scsi_device
* reference, we enforce that udev_path has been set
*/
if (!(se_dev->su_dev_flags & SDF_USING_UDEV_PATH)) {
Expand All @@ -540,7 +540,7 @@ static struct se_device *pscsi_create_virtdevice(
return ERR_PTR(-EINVAL);
}
/*
* If no scsi_host_id= was passed for PHV_VIRUTAL_HOST_ID,
* If no scsi_host_id= was passed for PHV_VIRTUAL_HOST_ID,
* use the original TCM hba ID to reference Linux/SCSI Host No
* and enable for PHV_LLD_SCSI_HOST_NO mode.
*/
Expand Down Expand Up @@ -569,8 +569,8 @@ static struct se_device *pscsi_create_virtdevice(
}
}
} else {
if (phv->phv_mode == PHV_VIRUTAL_HOST_ID) {
pr_err("pSCSI: PHV_VIRUTAL_HOST_ID set while"
if (phv->phv_mode == PHV_VIRTUAL_HOST_ID) {
pr_err("pSCSI: PHV_VIRTUAL_HOST_ID set while"
" struct Scsi_Host exists\n");
return ERR_PTR(-EEXIST);
}
Expand Down Expand Up @@ -600,7 +600,7 @@ static struct se_device *pscsi_create_virtdevice(
}

if (!dev) {
if (phv->phv_mode == PHV_VIRUTAL_HOST_ID)
if (phv->phv_mode == PHV_VIRTUAL_HOST_ID)
scsi_host_put(sh);
else if (legacy_mode_enable) {
pscsi_pmode_enable_hba(hba, 0);
Expand All @@ -616,7 +616,7 @@ static struct se_device *pscsi_create_virtdevice(
pr_err("pSCSI: Unable to locate %d:%d:%d:%d\n", sh->host_no,
pdv->pdv_channel_id, pdv->pdv_target_id, pdv->pdv_lun_id);

if (phv->phv_mode == PHV_VIRUTAL_HOST_ID)
if (phv->phv_mode == PHV_VIRTUAL_HOST_ID)
scsi_host_put(sh);
else if (legacy_mode_enable) {
pscsi_pmode_enable_hba(hba, 0);
Expand Down Expand Up @@ -898,7 +898,7 @@ static ssize_t pscsi_show_configfs_dev_params(struct se_hba *hba,
ssize_t bl;
int i;

if (phv->phv_mode == PHV_VIRUTAL_HOST_ID)
if (phv->phv_mode == PHV_VIRTUAL_HOST_ID)
snprintf(host_id, 16, "%d", pdv->pdv_host_id);
else
snprintf(host_id, 16, "PHBA Mode");
Expand Down
2 changes: 1 addition & 1 deletion drivers/target/target_core_pscsi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ struct pscsi_dev_virt {
} ____cacheline_aligned;

typedef enum phv_modes {
PHV_VIRUTAL_HOST_ID,
PHV_VIRTUAL_HOST_ID,
PHV_LLD_SCSI_HOST_NO
} phv_modes_t;

Expand Down

0 comments on commit e6a8a41

Please sign in to comment.