mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 08:08:54 +00:00
cfq-iosched: free cic_index if blkio_alloc_blkg_stats fails
If we fail allocating the blkpg stats, we free cfqd and cfgq. But we need to free the IDA cfqd->cic_index as well. Signed-off-by: majianpeng <majianpeng@gmail.com> Cc: stable@kernel.org Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
parent
59bd71a81b
commit
2984ff38cc
1 changed files with 5 additions and 0 deletions
|
@ -4036,6 +4036,11 @@ static void *cfq_init_queue(struct request_queue *q)
|
||||||
|
|
||||||
if (blkio_alloc_blkg_stats(&cfqg->blkg)) {
|
if (blkio_alloc_blkg_stats(&cfqg->blkg)) {
|
||||||
kfree(cfqg);
|
kfree(cfqg);
|
||||||
|
|
||||||
|
spin_lock(&cic_index_lock);
|
||||||
|
ida_remove(&cic_index_ida, cfqd->cic_index);
|
||||||
|
spin_unlock(&cic_index_lock);
|
||||||
|
|
||||||
kfree(cfqd);
|
kfree(cfqd);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue