diff options
| author | Michael Christie | 2012-02-09 20:14:09 +0100 |
|---|---|---|
| committer | James Bottomley | 2012-02-18 15:48:29 +0100 |
| commit | c7a992784240c1b16425c6a9606c9db0fc28fb0c (patch) | |
| tree | dc98a99dd15709b8c47335a3efe7d9c4189a69ac /drivers/scsi | |
| parent | [SCSI] qla2xxx: Correct out of bounds read of ISP2200 mailbox registers. (diff) | |
| download | kernel-qcow2-linux-c7a992784240c1b16425c6a9606c9db0fc28fb0c.tar.gz kernel-qcow2-linux-c7a992784240c1b16425c6a9606c9db0fc28fb0c.tar.xz kernel-qcow2-linux-c7a992784240c1b16425c6a9606c9db0fc28fb0c.zip | |
[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')
| -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 qla2xxx_eh_host_reset(struct scsi_cmnd *cmd) { 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; int ret = FAILED; unsigned int id, lun; @@ -1140,15 +1139,6 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *cmd) id = cmd->device->id; 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, "ADAPTER RESET ISSUED nexus=%ld:%d:%d.\n", vha->host_no, id, lun); |