فهرست منبع

[SCSI] gdth: don't call pci_free_consistent under spinlock

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>
James Bottomley 17 سال پیش
والد
کامیت
ff83efacf2
1فایلهای تغییر یافته به همراه2 افزوده شده و 4 حذف شده
  1. 2 4
      drivers/scsi/gdth_proc.c

+ 2 - 4
drivers/scsi/gdth_proc.c

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