linux/drivers/block
Linus Torvalds dab058fd5f floppy: cancel any pending fd_timeouts before adding a new one
In commit 070ad7e793 ("floppy: convert to delayed work and
single-thread wq") the 'fd_timeout' timer was converted to a delayed
work.  However, the "del_timer(&fd_timeout)" was lost in the process,
and any previous pending timeouts would stay active when we then
re-queued the timeout.

This resulted in the floppy probe sequence having a (stale) 20s timeout
rather than the intended 3s timeout, and thus made booting with the
floppy driver (but no actual floppy controller) take much longer than it
should.

Of course, there's little reason for most people to compile the floppy
driver into the kernel at all, which is why most people never noticed.

Canceling the delayed work where we used to do the del_timer() fixes the
issue, and makes the floppy probing use the proper new timeout instead.
The three second timeout is still very wasteful, but better than the 20s
one.

Reported-and-tested-by: Andi Kleen <ak@linux.intel.com>
Reported-and-tested-by: Calvin Walton <calvin.walton@kepstin.ca>
Cc: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-07-03 15:51:22 -07:00
..
aoe
drbd Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-linus 2012-06-13 21:19:42 +02:00
mtip32xx mtip32xx: Create debugfs entries for troubleshooting 2012-06-05 09:13:49 +02:00
paride
xen-blkback Merge branch 'stable/for-jens-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus 2012-06-13 21:19:06 +02:00
amiflop.c
ataflop.c
brd.c
cciss.c
cciss.h
cciss_cmd.h
cciss_scsi.c
cciss_scsi.h
cpqarray.c
cpqarray.h
cryptoloop.c
DAC960.c
DAC960.h
floppy.c floppy: cancel any pending fd_timeouts before adding a new one 2012-07-03 15:51:22 -07:00
hd.c
ida_cmd.h
ida_ioctl.h
Kconfig
loop.c
Makefile
mg_disk.c
nbd.c
nvme.c
osdblk.c
pktcdvd.c
ps3disk.c
ps3vram.c
rbd.c
rbd_types.h
smart1,2.h
sunvdc.c
swim.c
swim3.c
swim_asm.S
sx8.c
ub.c
umem.c umem: fix up unplugging 2012-06-13 21:17:21 +02:00
umem.h
virtio_blk.c virtio_blk: Drop unused request tracking list 2012-05-22 12:16:14 +09:30
xd.c
xd.h
xen-blkfront.c xen/blkfront: Add WARN to deal with misbehaving backends. 2012-06-12 08:29:04 -04:00
xsysace.c
z2ram.c