sata_mv: grab host lock inside eng_timeout
PATCH 1/1 sata_mv: grab host lock inside eng_timeout
Bug fix: mv_eng_timeout() calls mv_err_intr() without first grabbing the host lock, which can lead to all sorts of interesting scenarios.
This whole error-handling portion of sata_mv is nasty (and will get fixed for the new EH stuff), but for now this patch will help keep it on life-support.
Signed-off-by Mark Lord <[email protected]>
---
drivers/scsi/sata_mv.c renamed from drivers/scsi/sata_mv.c.orig +3 -0
@@ -2035,6 +2035,7 @@static void mv_eng_timeout (struct ata_port *ap) {struct ata_queued_cmd *qc; +unsigned long flags;printk (KERN_ERR "ata%u: Entering mv_eng_timeout\n" ,ap->id);DPRINTK ("All regs @ start of eng_timeout\n" );
@@ -2046,8 +2047,10 @@ ap->host_set->mmio_base, ap, qc, qc->scsicmd, &qc->scsicmd->cmnd); +spin_lock_irqsave (&ap->host_set->lock, flags);mv_err_intr (ap,0 );mv_stop_and_reset (ap); +spin_unlock_irqrestore (&ap->host_set->lock, flags);WARN_ON (!(qc->flags &ATA_QCFLAG_ACTIVE ));if (qc->flags &ATA_QCFLAG_ACTIVE ) {
Jeff Garzik
AppliedQuoted 7 lines · Mark Lord
Bug fix:
mv_eng_timeout()callsmv_err_intr()without first grabbing the host lock, which can lead to all sorts of interesting scenarios.This whole error-handling portion of
sata_mvis nasty (and will get fixed for the new EH stuff), but for now this patch will help keep it on life-support.Signed-off-by Mark Lord <[email protected]>
applied