diff options
| author | Maciej Trela <maciej.trela@intel.com> | 2012-06-22 08:25:37 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-07-20 09:58:47 +0200 |
| commit | 36fed4980529b3d4090fcb677ad46b27e270be40 (patch) | |
| tree | 494d88ad67ddd8b707568e5978ce45e64ca20fdf /drivers/scsi/libsas | |
| parent | [SCSI] fix eh wakeup (scsi_schedule_eh vs scsi_restart_operations) (diff) | |
| download | linux-36fed4980529b3d4090fcb677ad46b27e270be40.tar.xz linux-36fed4980529b3d4090fcb677ad46b27e270be40.zip | |
[SCSI] libsas: cleanup spurious calls to scsi_schedule_eh
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>
Diffstat (limited to 'drivers/scsi/libsas')
| -rw-r--r-- | drivers/scsi/libsas/sas_ata.c | 1 | ||||
| -rw-r--r-- | drivers/scsi/libsas/sas_scsi_host.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c index b035acf18730..bec3bc8aab0c 100644 --- a/drivers/scsi/libsas/sas_ata.c +++ b/drivers/scsi/libsas/sas_ata.c @@ -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; } diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c index a09da44e282b..52d5b0133db0 100644 --- a/drivers/scsi/libsas/sas_scsi_host.c +++ b/drivers/scsi/libsas/sas_scsi_host.c @@ -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); } } |