1 files changed, 8 insertions, 3 deletions

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 838e5b991851..c7181d85b993 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -635,7 +635,7 @@ lpfc_clr_rrq_active(struct lpfc_hba *phba,
         if (!ndlp)
                 goto out;
 
-        if (test_and_clear_bit(xritag, ndlp->active_rrqs.xri_bitmap)) {
+        if (test_and_clear_bit(xritag, ndlp->active_rrqs_xri_bitmap)) {
                 rrq->send_rrq = 0;
                 rrq->xritag = 0;
                 rrq->rrq_stop_time = 0;
@@ -813,7 +813,9 @@ lpfc_test_rrq_active(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp,
 {
         if (!ndlp)
                 return 0;
-        if (test_bit(xritag, ndlp->active_rrqs.xri_bitmap))
+        if (!ndlp->active_rrqs_xri_bitmap)
+                return 0;
+        if (test_bit(xritag, ndlp->active_rrqs_xri_bitmap))
                         return 1;
         else
                 return 0;
@@ -863,7 +865,10 @@ lpfc_set_rrq_active(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp,
         if (ndlp->vport && (ndlp->vport->load_flag & FC_UNLOADING))
                 goto out;
 
-        if (test_and_set_bit(xritag, ndlp->active_rrqs.xri_bitmap))
+        if (!ndlp->active_rrqs_xri_bitmap)
+                goto out;
+
+        if (test_and_set_bit(xritag, ndlp->active_rrqs_xri_bitmap))
                 goto out;
 
         spin_unlock_irqrestore(&phba->hbalock, iflags);