[SCSI] qla2xxx: Drop legacy 'bypass lun scan for tape device' code.

Internal lun discovery has been removed since fc_transport
integration.  Short-circuiting for tape-devices in
qla2x00_update_fcport() could inadvertently result in a
blocked rport timing-out and its targets being reaped.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
andrew.vasquez@qlogic.com 2006-01-20 14:53:25 -08:00 committed by James Bottomley
parent 052c40c83b
commit 77427f514f

View File

@ -2041,10 +2041,6 @@ qla2x00_probe_for_all_luns(scsi_qla_host_t *ha)
void void
qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport) qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)
{ {
uint16_t index;
unsigned long flags;
srb_t *sp;
fcport->ha = ha; fcport->ha = ha;
fcport->login_retry = 0; fcport->login_retry = 0;
fcport->port_login_retry_count = ha->port_down_retry_count * fcport->port_login_retry_count = ha->port_down_retry_count *
@ -2053,28 +2049,6 @@ qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)
PORT_RETRY_TIME); PORT_RETRY_TIME);
fcport->flags &= ~FCF_LOGIN_NEEDED; fcport->flags &= ~FCF_LOGIN_NEEDED;
/*
* Check for outstanding cmd on tape Bypass LUN discovery if active
* command on tape.
*/
if (fcport->flags & FCF_TAPE_PRESENT) {
spin_lock_irqsave(&ha->hardware_lock, flags);
for (index = 1; index < MAX_OUTSTANDING_COMMANDS; index++) {
fc_port_t *sfcp;
if ((sp = ha->outstanding_cmds[index]) != 0) {
sfcp = sp->fcport;
if (sfcp == fcport) {
atomic_set(&fcport->state, FCS_ONLINE);
spin_unlock_irqrestore(
&ha->hardware_lock, flags);
return;
}
}
}
spin_unlock_irqrestore(&ha->hardware_lock, flags);
}
if (fcport->port_type == FCT_INITIATOR || if (fcport->port_type == FCT_INITIATOR ||
fcport->port_type == FCT_BROADCAST) fcport->port_type == FCT_BROADCAST)
fcport->device_type = TYPE_PROCESSOR; fcport->device_type = TYPE_PROCESSOR;