summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorweiping zhang <zhangweiping@didichuxing.com>2017-08-19 00:37:20 +0800
committerJens Axboe <axboe@kernel.dk>2017-08-23 15:35:54 -0600
commit37dcd6570f2e95364c26426d4110ba40c07df067 (patch)
treef8e42939f4e973d805307bcdecb6c5ee16c8849d
parent74d46992e0d9dee7f1f376de0d56d31614c8a17a (diff)
downloadlinux-0-day-37dcd6570f2e95364c26426d4110ba40c07df067.tar.gz
block, bfq: fix error handle in bfq_init
if elv_register fail, bfq_pool should be free. Signed-off-by: weiping zhang <zhangweiping@didichuxing.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--block/bfq-iosched.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index 509f399..ea2832b 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -5062,10 +5062,12 @@ static int __init bfq_init(void)
ret = elv_register(&iosched_bfq_mq);
if (ret)
- goto err_pol_unreg;
+ goto slab_kill;
return 0;
+slab_kill:
+ bfq_slab_kill();
err_pol_unreg:
#ifdef CONFIG_BFQ_GROUP_IOSCHED
blkcg_policy_unregister(&blkcg_policy_bfq);