]> git.baikalelectronics.ru Git - kernel.git/commit
pktcdvd: Fix pkt_setup_dev() error path
authorBart Van Assche <bart.vanassche@wdc.com>
Tue, 2 Jan 2018 19:39:47 +0000 (11:39 -0800)
committerJens Axboe <axboe@kernel.dk>
Fri, 5 Jan 2018 16:03:03 +0000 (09:03 -0700)
commit86a2c3daa2fe4d9bd47ef7d93a846f7bbc26c9d8
treec5cab6b9052cd1655076a568728575e9a112c0d1
parentca56ed1fd65b3763451256b963179df2da3f44c9
pktcdvd: Fix pkt_setup_dev() error path

Commit 45e09a373f01 ("block: make gendisk hold a reference to its queue")
modified add_disk() and disk_release() but did not update any of the
error paths that trigger a put_disk() call after disk->queue has been
assigned. That introduced the following behavior in the pktcdvd driver
if pkt_new_dev() fails:

Kernel BUG at 00000000e98fd882 [verbose debug info unavailable]

Since disk_release() calls blk_put_queue() anyway if disk->queue != NULL,
fix this by removing the blk_cleanup_queue() call from the pkt_setup_dev()
error path.

Fixes: commit 45e09a373f01 ("block: make gendisk hold a reference to its queue")
Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
Cc: <stable@vger.kernel.org> # v3.2
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/pktcdvd.c