scsi: qla2xxx: Fix driver hang when FC-NVMe LUNs are configured

commit 39553065f77c297239308470ee313841f4e07db4 upstream.

This patch fixes multiple call for qla_nvme_unregister_remote_port() as part
of qlt_schedule_session_for_deletion(), Do not call it again during
qla_nvme_delete()

Fixes: e473b3074104 ("scsi: qla2xxx: Add FC-NVMe abort processing")
Cc: <stable@vger.kernel.org>
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c
index 8dc7a5c..e6545cb 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_nvme.c
+++ b/drivers/scsi/qla2xxx/qla_nvme.c
@@ -660,9 +660,6 @@ void qla_nvme_delete(struct scsi_qla_host *vha)
                    __func__, fcport);
 
                nvme_fc_set_remoteport_devloss(fcport->nvme_remote_port, 0);
-               init_completion(&fcport->nvme_del_done);
-               nvme_fc_unregister_remoteport(fcport->nvme_remote_port);
-               wait_for_completion(&fcport->nvme_del_done);
        }
 
        if (vha->nvme_local_port) {