diff options
author | Michael Christie <mchristi@redhat.com> | 2012-02-09 14:14:09 -0500 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2012-02-18 09:48:29 -0500 |
commit | c7a992784240c1b16425c6a9606c9db0fc28fb0c (patch) | |
tree | dc98a99dd15709b8c47335a3efe7d9c4189a69ac /drivers/scsi/qla2xxx | |
parent | 67ddda353c4e26ba23a199ae64fdf283b669469b (diff) |
[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>
Diffstat (limited to 'drivers/scsi/qla2xxx')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 7e617a60e71f..036030c95339 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
@@ -1131,7 +1131,6 @@ static int | |||
1131 | qla2xxx_eh_host_reset(struct scsi_cmnd *cmd) | 1131 | qla2xxx_eh_host_reset(struct scsi_cmnd *cmd) |
1132 | { | 1132 | { |
1133 | scsi_qla_host_t *vha = shost_priv(cmd->device->host); | 1133 | scsi_qla_host_t *vha = shost_priv(cmd->device->host); |
1134 | fc_port_t *fcport = (struct fc_port *) cmd->device->hostdata; | ||
1135 | struct qla_hw_data *ha = vha->hw; | 1134 | struct qla_hw_data *ha = vha->hw; |
1136 | int ret = FAILED; | 1135 | int ret = FAILED; |
1137 | unsigned int id, lun; | 1136 | unsigned int id, lun; |
@@ -1140,15 +1139,6 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *cmd) | |||
1140 | id = cmd->device->id; | 1139 | id = cmd->device->id; |
1141 | lun = cmd->device->lun; | 1140 | lun = cmd->device->lun; |
1142 | 1141 | ||
1143 | if (!fcport) { | ||
1144 | return ret; | ||
1145 | } | ||
1146 | |||
1147 | ret = fc_block_scsi_eh(cmd); | ||
1148 | if (ret != 0) | ||
1149 | return ret; | ||
1150 | ret = FAILED; | ||
1151 | |||
1152 | ql_log(ql_log_info, vha, 0x8018, | 1142 | ql_log(ql_log_info, vha, 0x8018, |
1153 | "ADAPTER RESET ISSUED nexus=%ld:%d:%d.\n", vha->host_no, id, lun); | 1143 | "ADAPTER RESET ISSUED nexus=%ld:%d:%d.\n", vha->host_no, id, lun); |
1154 | 1144 | ||