[SCSI] lpfc: Balance locking
authorMatthew Wilcox <matthew@wil.cx>
Thu, 21 Feb 2008 12:44:33 +0000 (05:44 -0700)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Fri, 22 Feb 2008 23:15:35 +0000 (17:15 -0600)
Commit 3163f725a5d071eea1830bbbfab78cfe3fc9baaf introduced locking in
lpfc_sli_hbqbuf_fill_hbqs, but missed unlocking on one exit.

Reported-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Acked-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
drivers/scsi/lpfc/lpfc_sli.c

index f53206411cd8048b0a3e00375af572b9b406a15b..fc0d9501aba628f41a79c0b4a8ae31f384d60ab2 100644 (file)
@@ -648,28 +648,24 @@ lpfc_sli_hbqbuf_fill_hbqs(struct lpfc_hba *phba, uint32_t hbqno, uint32_t count)
        unsigned long flags;
        struct hbq_dmabuf *hbq_buffer;
 
        unsigned long flags;
        struct hbq_dmabuf *hbq_buffer;
 
-       if (!phba->hbqs[hbqno].hbq_alloc_buffer) {
+       if (!phba->hbqs[hbqno].hbq_alloc_buffer)
                return 0;
                return 0;
-       }
 
        start = phba->hbqs[hbqno].buffer_count;
        end = count + start;
 
        start = phba->hbqs[hbqno].buffer_count;
        end = count + start;
-       if (end > lpfc_hbq_defs[hbqno]->entry_count) {
+       if (end > lpfc_hbq_defs[hbqno]->entry_count)
                end = lpfc_hbq_defs[hbqno]->entry_count;
                end = lpfc_hbq_defs[hbqno]->entry_count;
-       }
 
        /* Check whether HBQ is still in use */
        spin_lock_irqsave(&phba->hbalock, flags);
 
        /* Check whether HBQ is still in use */
        spin_lock_irqsave(&phba->hbalock, flags);
-       if (!phba->hbq_in_use) {
-               spin_unlock_irqrestore(&phba->hbalock, flags);
-               return 0;
-       }
+       if (!phba->hbq_in_use)
+               goto out;
 
        /* Populate HBQ entries */
        for (i = start; i < end; i++) {
                hbq_buffer = (phba->hbqs[hbqno].hbq_alloc_buffer)(phba);
                if (!hbq_buffer)
 
        /* Populate HBQ entries */
        for (i = start; i < end; i++) {
                hbq_buffer = (phba->hbqs[hbqno].hbq_alloc_buffer)(phba);
                if (!hbq_buffer)
-                       return 1;
+                       goto err;
                hbq_buffer->tag = (i | (hbqno << 16));
                if (lpfc_sli_hbq_to_firmware(phba, hbqno, hbq_buffer))
                        phba->hbqs[hbqno].buffer_count++;
                hbq_buffer->tag = (i | (hbqno << 16));
                if (lpfc_sli_hbq_to_firmware(phba, hbqno, hbq_buffer))
                        phba->hbqs[hbqno].buffer_count++;
@@ -677,8 +673,12 @@ lpfc_sli_hbqbuf_fill_hbqs(struct lpfc_hba *phba, uint32_t hbqno, uint32_t count)
                        (phba->hbqs[hbqno].hbq_free_buffer)(phba, hbq_buffer);
        }
 
                        (phba->hbqs[hbqno].hbq_free_buffer)(phba, hbq_buffer);
        }
 
+ out:
        spin_unlock_irqrestore(&phba->hbalock, flags);
        return 0;
        spin_unlock_irqrestore(&phba->hbalock, flags);
        return 0;
+ err:
+       spin_unlock_irqrestore(&phba->hbalock, flags);
+       return 1;
 }
 
 int
 }
 
 int