[SCSI] qla2xxx: Remove check for null fcport from host reset handler.
Remove the check for a NULL fcport so that the host reset will run unconditionally to unwedge any commands before the device is offlined and to prevent a quick runthrough of the SCSI error handling. Signed-off-by: Michael Christie <mchristi@redhat.com> Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
committed by
James Bottomley
parent
67ddda353c
commit
c7a9927842
@@ -1131,7 +1131,6 @@ static int
|
|||||||
qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
|
qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
|
||||||
{
|
{
|
||||||
scsi_qla_host_t *vha = shost_priv(cmd->device->host);
|
scsi_qla_host_t *vha = shost_priv(cmd->device->host);
|
||||||
fc_port_t *fcport = (struct fc_port *) cmd->device->hostdata;
|
|
||||||
struct qla_hw_data *ha = vha->hw;
|
struct qla_hw_data *ha = vha->hw;
|
||||||
int ret = FAILED;
|
int ret = FAILED;
|
||||||
unsigned int id, lun;
|
unsigned int id, lun;
|
||||||
@@ -1140,15 +1139,6 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
|
|||||||
id = cmd->device->id;
|
id = cmd->device->id;
|
||||||
lun = cmd->device->lun;
|
lun = cmd->device->lun;
|
||||||
|
|
||||||
if (!fcport) {
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = fc_block_scsi_eh(cmd);
|
|
||||||
if (ret != 0)
|
|
||||||
return ret;
|
|
||||||
ret = FAILED;
|
|
||||||
|
|
||||||
ql_log(ql_log_info, vha, 0x8018,
|
ql_log(ql_log_info, vha, 0x8018,
|
||||||
"ADAPTER RESET ISSUED nexus=%ld:%d:%d.\n", vha->host_no, id, lun);
|
"ADAPTER RESET ISSUED nexus=%ld:%d:%d.\n", vha->host_no, id, lun);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user