]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Fix Locking code raising IRQ twice
authorVaios Papadimitriou <vaios.papadimitriou@emulex.com>
Tue, 8 May 2012 22:01:24 +0000 (17:01 -0500)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Wed, 9 May 2012 00:01:24 +0000 (17:01 -0700)
Remove the irq part of the locking and unlocking calls, this could have caused
a deadlock because the cpu could have interrupted this thread while the hbalock
was still held.

commit id: 728599090a9bf3aefb1226cc063295886525cd0e

Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>
drivers/scsi/lpfc/lpfc_hbadisc.c

index 2cadb8271f10bf7bc694988ac9a1dd1a6f562ba3..343d87ba4df8f2e58cb2685c02bd86909d64e793 100644 (file)
@@ -2977,9 +2977,9 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, struct lpfc_mbx_read_top *la)
                                "topology\n");
                                /* Get Loop Map information */
                if (bf_get(lpfc_mbx_read_top_il, la)) {
-                       spin_lock_irq(shost->host_lock);
+                       spin_lock(shost->host_lock);
                        vport->fc_flag |= FC_LBIT;
-                       spin_unlock_irq(shost->host_lock);
+                       spin_unlock(shost->host_lock);
                }
 
                vport->fc_myDID = bf_get(lpfc_mbx_read_top_alpa_granted, la);
@@ -3029,9 +3029,9 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, struct lpfc_mbx_read_top *la)
                                phba->sli3_options |= LPFC_SLI3_NPIV_ENABLED;
                }
                vport->fc_myDID = phba->fc_pref_DID;
-               spin_lock_irq(shost->host_lock);
+               spin_lock(shost->host_lock);
                vport->fc_flag |= FC_LBIT;
-               spin_unlock_irq(shost->host_lock);
+               spin_unlock(shost->host_lock);
        }
        spin_unlock_irq(&phba->hbalock);