diff options
author | andrew.vasquez@qlogic.com <andrew.vasquez@qlogic.com> | 2006-01-20 17:53:25 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2006-01-26 08:17:25 -0500 |
commit | 77427f514f88143bfef41ba8c1e624bc45f42297 (patch) | |
tree | c19f35ec08603930b29d2edb34b93100f4759fd7 | |
parent | 052c40c83b4ca37be226112049b60097cb9961e1 (diff) |
[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>
-rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 16c889261d94..e67bb0997818 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c | |||
@@ -2041,10 +2041,6 @@ qla2x00_probe_for_all_luns(scsi_qla_host_t *ha) | |||
2041 | void | 2041 | void |
2042 | qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport) | 2042 | qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport) |
2043 | { | 2043 | { |
2044 | uint16_t index; | ||
2045 | unsigned long flags; | ||
2046 | srb_t *sp; | ||
2047 | |||
2048 | fcport->ha = ha; | 2044 | fcport->ha = ha; |
2049 | fcport->login_retry = 0; | 2045 | fcport->login_retry = 0; |
2050 | fcport->port_login_retry_count = ha->port_down_retry_count * | 2046 | 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) | |||
2053 | PORT_RETRY_TIME); | 2049 | PORT_RETRY_TIME); |
2054 | fcport->flags &= ~FCF_LOGIN_NEEDED; | 2050 | fcport->flags &= ~FCF_LOGIN_NEEDED; |
2055 | 2051 | ||
2056 | /* | ||
2057 | * Check for outstanding cmd on tape Bypass LUN discovery if active | ||
2058 | * command on tape. | ||
2059 | */ | ||
2060 | if (fcport->flags & FCF_TAPE_PRESENT) { | ||
2061 | spin_lock_irqsave(&ha->hardware_lock, flags); | ||
2062 | for (index = 1; index < MAX_OUTSTANDING_COMMANDS; index++) { | ||
2063 | fc_port_t *sfcp; | ||
2064 | |||
2065 | if ((sp = ha->outstanding_cmds[index]) != 0) { | ||
2066 | sfcp = sp->fcport; | ||
2067 | if (sfcp == fcport) { | ||
2068 | atomic_set(&fcport->state, FCS_ONLINE); | ||
2069 | spin_unlock_irqrestore( | ||
2070 | &ha->hardware_lock, flags); | ||
2071 | return; | ||
2072 | } | ||
2073 | } | ||
2074 | } | ||
2075 | spin_unlock_irqrestore(&ha->hardware_lock, flags); | ||
2076 | } | ||
2077 | |||
2078 | if (fcport->port_type == FCT_INITIATOR || | 2052 | if (fcport->port_type == FCT_INITIATOR || |
2079 | fcport->port_type == FCT_BROADCAST) | 2053 | fcport->port_type == FCT_BROADCAST) |
2080 | fcport->device_type = TYPE_PROCESSOR; | 2054 | fcport->device_type = TYPE_PROCESSOR; |