diff options
| author | Giridhar Malavali <giridhar.malavali@qlogic.com> | 2010-09-03 15:20:55 -0700 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-09-05 15:36:21 -0300 |
| commit | 3fadb80b0f39b193caafeed615a219aae57279fe (patch) | |
| tree | 875f9bbc7011147845be457c7cd7c6fa42101c5e /drivers | |
| parent | b1d46989c12ec4d93f274ca8378bb1a6014d244a (diff) | |
| download | linux-3.10-3fadb80b0f39b193caafeed615a219aae57279fe.tar.gz linux-3.10-3fadb80b0f39b193caafeed615a219aae57279fe.tar.bz2 linux-3.10-3fadb80b0f39b193caafeed615a219aae57279fe.zip | |
[SCSI] qla2xxx: Clear local references of rport on device loss timeout notification from FC transport.
The clearing of local references to rport was blocked when abort is
active. This code clears the local references unconditionaly upon
device loss timeout callback from FC transport.
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_attr.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c index 560641aa3a5..c9781050c9e 100644 --- a/drivers/scsi/qla2xxx/qla_attr.c +++ b/drivers/scsi/qla2xxx/qla_attr.c @@ -1547,22 +1547,22 @@ qla2x00_dev_loss_tmo_callbk(struct fc_rport *rport) if (!fcport) return; - if (test_bit(ABORT_ISP_ACTIVE, &fcport->vha->dpc_flags)) - return; - - if (unlikely(pci_channel_offline(fcport->vha->hw->pdev))) { - qla2x00_abort_all_cmds(fcport->vha, DID_NO_CONNECT << 16); - return; - } - /* * Transport has effectively 'deleted' the rport, clear * all local references. */ spin_lock_irq(host->host_lock); - fcport->rport = NULL; + fcport->rport = fcport->drport = NULL; *((fc_port_t **)rport->dd_data) = NULL; spin_unlock_irq(host->host_lock); + + if (test_bit(ABORT_ISP_ACTIVE, &fcport->vha->dpc_flags)) + return; + + if (unlikely(pci_channel_offline(fcport->vha->hw->pdev))) { + qla2x00_abort_all_cmds(fcport->vha, DID_NO_CONNECT << 16); + return; + } } static void |