From: Anil Gurumurthy <anil.gurumur...@qlogic.com>

Signed-off-by: Sudarsana Kalluru <sudarsana.kall...@qlogic.com>
Signed-off-by: Anil Gurumurthy <anil.gurumur...@qlogic.com>
---
 drivers/scsi/bfa/bfa_fcs_lport.c |    2 +-
 drivers/scsi/bfa/bfad_im.c       |   26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
index d823792..4631630 100644
--- a/drivers/scsi/bfa/bfa_fcs_lport.c
+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
@@ -2654,7 +2654,7 @@ bfa_fcs_fdmi_get_hbaattr(struct bfa_fcs_lport_fdmi_s 
*fdmi,
 
        strncpy(hba_attr->node_sym_name.symname,
                port->port_cfg.node_sym_name.symname, BFA_SYMNAME_MAXLEN);
-       strcpy(hba_attr->vendor_info, "BROCADE");
+       strcpy(hba_attr->vendor_info, "QLogic");
        hba_attr->num_ports =
                cpu_to_be32(bfa_ioc_get_nports(&port->fcs->bfa->ioc));
        hba_attr->fabric_name = port->fabric->lps->pr_nwwn;
diff --git a/drivers/scsi/bfa/bfad_im.c b/drivers/scsi/bfa/bfad_im.c
index 575efdc..3e4dce7 100644
--- a/drivers/scsi/bfa/bfad_im.c
+++ b/drivers/scsi/bfa/bfad_im.c
@@ -272,6 +272,19 @@ bfad_im_target_reset_send(struct bfad_s *bfad, struct 
scsi_cmnd *cmnd,
        cmnd->host_scribble = NULL;
        cmnd->SCp.Status = 0;
        bfa_itnim = bfa_fcs_itnim_get_halitn(&itnim->fcs_itnim);
+       /*
+        * bfa_itnim can be NULL if the port gets disconnected and the bfa
+        * and fcs layers have cleaned up their nexus with the targets and
+        * the same has not been cleaned up by the shim
+        */
+       if (bfa_itnim == NULL) {
+               bfa_tskim_free(tskim);
+               BFA_LOG(KERN_ERR, bfad, bfa_log_level,
+                       "target reset, bfa_itnim is NULL\n");
+               rc = BFA_STATUS_FAILED;
+               goto out;
+       }
+
        memset(&scsilun, 0, sizeof(scsilun));
        bfa_tskim_start(tskim, bfa_itnim, scsilun,
                            FCP_TM_TARGET_RESET, BFAD_TARGET_RESET_TMO);
@@ -327,6 +340,19 @@ bfad_im_reset_lun_handler(struct scsi_cmnd *cmnd)
        cmnd->SCp.ptr = (char *)&wq;
        cmnd->SCp.Status = 0;
        bfa_itnim = bfa_fcs_itnim_get_halitn(&itnim->fcs_itnim);
+       /*
+        * bfa_itnim can be NULL if the port gets disconnected and the bfa
+        * and fcs layers have cleaned up their nexus with the targets and
+        * the same has not been cleaned up by the shim
+        */
+       if (bfa_itnim == NULL) {
+               bfa_tskim_free(tskim);
+               BFA_LOG(KERN_ERR, bfad, bfa_log_level,
+                       "lun reset, bfa_itnim is NULL\n");
+               spin_unlock_irqrestore(&bfad->bfad_lock, flags);
+               rc = FAILED;
+               goto out;
+       }
        int_to_scsilun(cmnd->device->lun, &scsilun);
        bfa_tskim_start(tskim, bfa_itnim, scsilun,
                            FCP_TM_LUN_RESET, BFAD_LUN_RESET_TMO);
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to