Tejun Heo dd8717da6d ide: clean up timed out request handling ... 8f6205cd57 introduced a bug where a timed out DMA request is never requeued and lost. 6072f7491f fixed this by making ide_dma_timeout_retry() requeue the request itself. While the fix is correct, it makes DMA and non-DMA paths asymmetric regarding how the in flight request is requeued. As long as hwif->rq is set, the IDE driver is assuming ownership of the request and the request should either be completed or requeued when clearing hwif->rq. In the timeout path, the ide driver holds onto the request as long as the recovery action (ie. reset) is in progress and clears it after the state machine is stopped (ide_stopped return), so the existing requeueing logic is correct. The bug occurred because ide_dma_timeout_retry() explicitly clears hwif->rq without requeueing it. ide_dma_timeout_retry() is called only by ide_timer_expiry() and returns ide_started only when ide_error() would return it - ie. after reset state machine has started in which case the state machine will eventually end up executing the ide_stopped path in ide_timer_expiry() after reset protocol is complete. So, there is no need to clear hwif->rq from ide_dma_timeout_retry(). ide_timer_expiry() will handle it the same way as PIO timeout path. Kill hwif->rq clearing and requeueing from ide_dma_timeout_retry() and let ide_timer_expiry() deal with it. The end result should remain the same. grepping shows ide_dma_timeout_retry() is the only site which clears hwif->rq without taking care of the request, so there shouldn't be similar fallouts. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>		2010-10-26 10:17:30 -07:00
..
aec62xx.c
ali14xx.c
alim15x3.c
amd74xx.c
at91_ide.c
atiixp.c
au1xxx-ide.c
buddha.c
cmd64x.c
cmd640.c
cs5520.c
cs5530.c
cs5535.c
cs5536.c
cy82c693.c
delkin_cb.c
dtc2278.c
falconide.c
gayle.c
hpt366.c	hpt366: fix clock turnaround	2010-10-26 10:17:29 -07:00
ht6560b.c
icside.c
ide_platform.c
ide-4drives.c
ide-acpi.c
ide-atapi.c
ide-cd_ioctl.c
ide-cd_verbose.c
ide-cd.c
ide-cd.h
ide-cs.c
ide-devsets.c
ide-disk_ioctl.c
ide-disk_proc.c
ide-disk.c
ide-disk.h
ide-dma-sff.c
ide-dma.c	ide: clean up timed out request handling	2010-10-26 10:17:30 -07:00
ide-eh.c
ide-floppy_ioctl.c
ide-floppy_proc.c
ide-floppy.c
ide-floppy.h
ide-gd.c
ide-gd.h
ide-generic.c
ide-h8300.c
ide-io-std.c
ide-io.c
ide-ioctls.c
ide-iops.c
ide-legacy.c
ide-lib.c
ide-park.c
ide-pci-generic.c
ide-pio-blacklist.c
ide-pm.c
ide-pnp.c
ide-probe.c
ide-proc.c
ide-scan-pci.c
ide-sysfs.c
ide-tape.c
ide-taskfile.c
ide-timings.c
ide-xfer-mode.c
ide.c
it821x.c
it8172.c
it8213.c
jmicron.c
Kconfig
macide.c
Makefile
ns87415.c
opti621.c
palm_bk3710.c
pdc202xx_new.c
pdc202xx_old.c
piix.c
pmac.c
q40ide.c
qd65xx.c
qd65xx.h
rapide.c
rz1000.c
sc1200.c
scc_pata.c
serverworks.c
setup-pci.c
sgiioc4.c
siimage.c
sis5513.c
sl82c105.c
slc90e66.c
tc86c001.c
triflex.c
trm290.c
tx4938ide.c
tx4939ide.c
umc8672.c
via82cxxx.c