diff options
| author |   Joe Carnuccio <joe.carnuccio@cavium.com> | 2017-03-15 09:48:43 -0700 |
|---|---|---|
| committer |   Nicholas Bellinger <nab@linux-iscsi.org> | 2017-03-18 17:27:56 -0700 |
| commit | c4a9b538ab2a109c5f9798bea1f8f4bf93aadfb9 (patch) | |
| tree | 81394821fc6f114be2aa2bb697f3be15b53e7e04 /drivers/scsi/qla2xxx/qla_attr.c | |
| parent | tcmu: Convert cmd_time_out into backend device attribute (diff) | |
| download | linux-dev-c4a9b538ab2a109c5f9798bea1f8f4bf93aadfb9.tar.xz linux-dev-c4a9b538ab2a109c5f9798bea1f8f4bf93aadfb9.zip | |
qla2xxx: Allow vref count to timeout on vport delete.
Cc: <stable@vger.kernel.org>
Signed-off-by: Joe Carnuccio <joe.carnuccio@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_attr.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_attr.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c index f610103994af..435ff7fd6384 100644 --- a/drivers/scsi/qla2xxx/qla_attr.c +++ b/drivers/scsi/qla2xxx/qla_attr.c @@ -2154,8 +2154,6 @@ qla24xx_vport_delete(struct fc_vport *fc_vport) "Timer for the VP[%d] has stopped\n", vha->vp_idx); } - BUG_ON(atomic_read(&vha->vref_count)); - qla2x00_free_fcports(vha); mutex_lock(&ha->vport_lock); @@ -2166,7 +2164,7 @@ qla24xx_vport_delete(struct fc_vport *fc_vport) dma_free_coherent(&ha->pdev->dev, vha->gnl.size, vha->gnl.l, vha->gnl.ldma); - if (vha->qpair->vp_idx == vha->vp_idx) { + if (vha->qpair && vha->qpair->vp_idx == vha->vp_idx) { if (qla2xxx_delete_qpair(vha, vha->qpair) != QLA_SUCCESS) ql_log(ql_log_warn, vha, 0x7087, "Queue Pair delete failed.\n"); |