These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / scsi / lpfc / lpfc_vport.c

diff --git a/kernel/drivers/scsi/lpfc/lpfc_vport.c b/kernel/drivers/scsi/lpfc/lpfc_vport.c
index a87ee33..7690126 100644 (file)
--- a/kernel/drivers/scsi/lpfc/lpfc_vport.c
+++ b/kernel/drivers/scsi/lpfc/lpfc_vport.c
@@ -567,8 +567,8 @@ int
 lpfc_vport_delete(struct fc_vport *fc_vport)
 {
        struct lpfc_nodelist *ndlp = NULL;
-       struct Scsi_Host *shost = (struct Scsi_Host *) fc_vport->shost;
        struct lpfc_vport *vport = *(struct lpfc_vport **)fc_vport->dd_data;
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
        struct lpfc_hba   *phba = vport->phba;
        long timeout;
        bool ns_ndlp_referenced = false;
@@ -645,8 +645,8 @@ lpfc_vport_delete(struct fc_vport *fc_vport)
        }
 
        /* Remove FC host and then SCSI host with the vport */
-       fc_remove_host(lpfc_shost_from_vport(vport));
-       scsi_remove_host(lpfc_shost_from_vport(vport));
+       fc_remove_host(shost);
+       scsi_remove_host(shost);
 
        ndlp = lpfc_findnode_did(phba->pport, Fabric_DID);
 
@@ -772,7 +772,8 @@ skip_logo:
                 * Completion of unreg_vpi (lpfc_mbx_cmpl_unreg_vpi)
                 * does the scsi_host_put() to release the vport.
                 */
-               if (lpfc_mbx_unreg_vpi(vport))
+               if (!(vport->vpi_state & LPFC_VPI_REGISTERED) ||
+                               lpfc_mbx_unreg_vpi(vport))
                        scsi_host_put(shost);
        } else
                scsi_host_put(shost);