[SCSI] libsas: cleanup spurious calls to scsi_schedule_eh
authorMaciej Trela <maciej.trela@intel.com>
Fri, 22 Jun 2012 06:25:37 +0000 (23:25 -0700)
committerJames Bottomley <JBottomley@Parallels.com>
Fri, 20 Jul 2012 07:58:47 +0000 (08:58 +0100)
eh is woken up automatically by the presence of failed commands,
scsi_schedule_eh is reserved for cases where there are no failed
commands.  This guarantees that host_eh_sceduled is only incremented
when an explicit eh request is made.

Reviewed-by: Jacek Danecki <jacek.danecki@intel.com>
Signed-off-by: Maciej Trela <maciej.trela@intel.com>
[fixed spurious delete of sas_ata_task_abort]
Signed-off-by: Artur Wojcik <artur.wojcik@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
drivers/scsi/libsas/sas_ata.c
drivers/scsi/libsas/sas_scsi_host.c

index b035acf..bec3bc8 100644 (file)
@@ -618,7 +618,6 @@ void sas_ata_task_abort(struct sas_task *task)
                spin_lock_irqsave(q->queue_lock, flags);
                blk_abort_request(qc->scsicmd->request);
                spin_unlock_irqrestore(q->queue_lock, flags);
-               scsi_schedule_eh(qc->scsicmd->device->host);
                return;
        }
 
index a09da44..52d5b01 100644 (file)
@@ -1018,7 +1018,6 @@ void sas_task_abort(struct sas_task *task)
                spin_lock_irqsave(q->queue_lock, flags);
                blk_abort_request(sc->request);
                spin_unlock_irqrestore(q->queue_lock, flags);
-               scsi_schedule_eh(sc->device->host);
        }
 }