]> git.karo-electronics.de Git - karo-tx-linux.git/commit
floppy: don't call alloc_ordered_workqueue inside the alloc_disk loop
authorHerton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Mon, 27 Aug 2012 23:56:51 +0000 (20:56 -0300)
committerJens Axboe <axboe@kernel.dk>
Tue, 30 Oct 2012 07:34:24 +0000 (08:34 +0100)
commitb54e1f88897bcacc2cd359f48ea3b39eaf55f084
tree664c10b93917479b78e11d8e53d77f7a5e9cc440
parent2911758f14e36a7cd5c7367f951dcb8817552f71
floppy: don't call alloc_ordered_workqueue inside the alloc_disk loop

Since commit 070ad7e ("floppy: convert to delayed work and single-thread
wq"), we end up calling alloc_ordered_workqueue multiple times inside
the loop, which shouldn't be intended. Besides the leak, other side
effect in the current code is if blk_init_queue fails, we would end up
calling unregister_blkdev even if we didn't call yet register_blkdev.

Just moved the allocation of floppy_wq before the loop, and adjusted the
code accordingly.

Cc: stable@vger.kernel.org # 3.5+
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Reviewed-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/floppy.c