mirror of https://gitee.com/openkylin/linux.git
[PATCH] dm: fix alloc_dev error path
While reading the code I found a bug in the error path in alloc_dev in dm.c When blk_alloc_queue fails there is no call to free_minor. This patch fixes the problem. Signed-off-by: Ishai Rabinovitz <ishai@mellanox.co.il> Signed-off-by: Alasdair G Kergon <agk@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
e90dae1f58
commit
e3f6ac6123
|
@ -943,7 +943,7 @@ static struct mapped_device *alloc_dev(int minor)
|
||||||
|
|
||||||
md->queue = blk_alloc_queue(GFP_KERNEL);
|
md->queue = blk_alloc_queue(GFP_KERNEL);
|
||||||
if (!md->queue)
|
if (!md->queue)
|
||||||
goto bad1;
|
goto bad1_free_minor;
|
||||||
|
|
||||||
md->queue->queuedata = md;
|
md->queue->queuedata = md;
|
||||||
md->queue->backing_dev_info.congested_fn = dm_any_congested;
|
md->queue->backing_dev_info.congested_fn = dm_any_congested;
|
||||||
|
@ -993,6 +993,7 @@ static struct mapped_device *alloc_dev(int minor)
|
||||||
mempool_destroy(md->io_pool);
|
mempool_destroy(md->io_pool);
|
||||||
bad2:
|
bad2:
|
||||||
blk_cleanup_queue(md->queue);
|
blk_cleanup_queue(md->queue);
|
||||||
|
bad1_free_minor:
|
||||||
free_minor(minor);
|
free_minor(minor);
|
||||||
bad1:
|
bad1:
|
||||||
module_put(THIS_MODULE);
|
module_put(THIS_MODULE);
|
||||||
|
|
Loading…
Reference in New Issue