mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
blkcg: fix memleak for iolatency
[ Upstream commit27029b4b18
] Normally, blkcg_iolatency_exit() will free related memory in iolatency when cleanup queue. But if blk_throtl_init() return error and queue init fail, blkcg_iolatency_exit() will not do that for us. Then it cause memory leak. Fixes:d706751215
("block: introduce blk-iolatency io controller") Signed-off-by: Yufen Yu <yuyufen@huawei.com> Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
872a2b3182
commit
05c608f630
1 changed files with 6 additions and 4 deletions
|
@ -1219,13 +1219,15 @@ int blkcg_init_queue(struct request_queue *q)
|
||||||
if (preloaded)
|
if (preloaded)
|
||||||
radix_tree_preload_end();
|
radix_tree_preload_end();
|
||||||
|
|
||||||
ret = blk_iolatency_init(q);
|
|
||||||
if (ret)
|
|
||||||
goto err_destroy_all;
|
|
||||||
|
|
||||||
ret = blk_throtl_init(q);
|
ret = blk_throtl_init(q);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err_destroy_all;
|
goto err_destroy_all;
|
||||||
|
|
||||||
|
ret = blk_iolatency_init(q);
|
||||||
|
if (ret) {
|
||||||
|
blk_throtl_exit(q);
|
||||||
|
goto err_destroy_all;
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
err_destroy_all:
|
err_destroy_all:
|
||||||
|
|
Loading…
Reference in a new issue