[SCSI] gdth: don't call pci_free_consistent under spinlock
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Sun, 17 Feb 2008 17:24:51 +0000 (11:24 -0600)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Mon, 18 Feb 2008 15:02:25 +0000 (09:02 -0600)
The spinlock is held over too large a region: pscratch is a permanent
address (it's allocated at boot time and never changes).  All you need
the smp lock for is mediating the scratch in use flag, so fix this by
moving the spinlock into the case where we set the pscratch_busy flag
to false.

Cc: Stable Tree <stable@kernel.org>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
drivers/scsi/gdth_proc.c

index de5773443c62802e746cee05f4e34ed8f643f3aa..ce0228e26aec24fe070acb47b93451b0c377af23 100644 (file)
@@ -694,15 +694,13 @@ static void gdth_ioctl_free(gdth_ha_str *ha, int size, char *buf, ulong64 paddr)
 {
     ulong flags;
 
-    spin_lock_irqsave(&ha->smp_lock, flags);
-
     if (buf == ha->pscratch) {
+       spin_lock_irqsave(&ha->smp_lock, flags);
         ha->scratch_busy = FALSE;
+       spin_unlock_irqrestore(&ha->smp_lock, flags);
     } else {
         pci_free_consistent(ha->pdev, size, buf, paddr);
     }
-
-    spin_unlock_irqrestore(&ha->smp_lock, flags);
 }
 
 #ifdef GDTH_IOCTL_PROC