diff options
| author | Brian King <brking@linux.vnet.ibm.com> | 2011-06-03 08:23:20 -0500 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2011-06-29 12:08:39 -0500 |
| commit | 38553564dc1052640515ed86be3ccb76cda6eee7 (patch) | |
| tree | 080ce5b65af268d025d43e2ff668169251f7bf5f /drivers | |
| parent | 0d72c6fcb5cd215eeab824fac216ea42c5b574aa (diff) | |
| download | linux-3.10-38553564dc1052640515ed86be3ccb76cda6eee7.tar.gz linux-3.10-38553564dc1052640515ed86be3ccb76cda6eee7.tar.bz2 linux-3.10-38553564dc1052640515ed86be3ccb76cda6eee7.zip | |
[SCSI] ibmvfc: Fix Virtual I/O failover hang
If a Virtual I/O server fails in a dual virtual I/O server multipath
configuration, ensure we delete all remote ports so that path failover
can occur. For a single path configuration, the remote ports will
go into devloss state.
Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/ibmvscsi/ibmvfc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c index b7650613b8c..bdfa223a7db 100644 --- a/drivers/scsi/ibmvscsi/ibmvfc.c +++ b/drivers/scsi/ibmvscsi/ibmvfc.c @@ -4306,8 +4306,8 @@ static void ibmvfc_do_work(struct ibmvfc_host *vhost) spin_lock_irqsave(vhost->host->host_lock, flags); if (rc == H_CLOSED) vio_enable_interrupts(to_vio_dev(vhost->dev)); - else if (rc || (rc = ibmvfc_send_crq_init(vhost)) || - (rc = vio_enable_interrupts(to_vio_dev(vhost->dev)))) { + if (rc || (rc = ibmvfc_send_crq_init(vhost)) || + (rc = vio_enable_interrupts(to_vio_dev(vhost->dev)))) { ibmvfc_link_down(vhost, IBMVFC_LINK_DEAD); dev_err(vhost->dev, "Error after reset (rc=%d)\n", rc); } |