scsi: qla2xxx: Fix NPIV host cleanup in target mode
authorSawan Chandak <sawan.chandak@cavium.com>
Mon, 4 Dec 2017 22:45:04 +0000 (14:45 -0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 8 Dec 2017 02:07:04 +0000 (21:07 -0500)
Add check to make sure we are cleaning up global target host list only
for NPIV hosts

Fixes: bdbe24de281e2 ("scsi: qla2xxx: Cleanup NPIV host in target mode during config teardown")
Cc: <stable@vger.kernel.org> # 4.10+
Signed-off-by: Sawan Chandak <sawan.chandak@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/qla2xxx/qla_target.c

index 924d58f5408f12a95e1970699997cafc2e3f189f..1bec8aebb7b6af1e926cb6150651170af32aa11a 100644 (file)
@@ -1561,8 +1561,11 @@ static void qlt_release(struct qla_tgt *tgt)
 
        btree_destroy64(&tgt->lun_qpair_map);
 
-       if (ha->tgt.tgt_ops && ha->tgt.tgt_ops->remove_target)
-               ha->tgt.tgt_ops->remove_target(vha);
+       if (vha->vp_idx)
+               if (ha->tgt.tgt_ops &&
+                   ha->tgt.tgt_ops->remove_target &&
+                   vha->vha_tgt.target_lport_ptr)
+                       ha->tgt.tgt_ops->remove_target(vha);
 
        vha->vha_tgt.qla_tgt = NULL;