Commit 8abef10b authored by Jens Axboe's avatar Jens Axboe

bfq-iosched: don't call bfqg_and_blkg_put for !CONFIG_BFQ_GROUP_IOSCHED

It's not available if we don't have group io scheduling set, and
there's no need to call it.

Fixes: 0d52af59 ("block, bfq: release oom-queue ref to root group on exit")
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 3609c471
...@@ -4893,10 +4893,10 @@ static void bfq_exit_queue(struct elevator_queue *e) ...@@ -4893,10 +4893,10 @@ static void bfq_exit_queue(struct elevator_queue *e)
hrtimer_cancel(&bfqd->idle_slice_timer); hrtimer_cancel(&bfqd->idle_slice_timer);
#ifdef CONFIG_BFQ_GROUP_IOSCHED
/* release oom-queue reference to root group */ /* release oom-queue reference to root group */
bfqg_and_blkg_put(bfqd->root_group); bfqg_and_blkg_put(bfqd->root_group);
#ifdef CONFIG_BFQ_GROUP_IOSCHED
blkcg_deactivate_policy(bfqd->queue, &blkcg_policy_bfq); blkcg_deactivate_policy(bfqd->queue, &blkcg_policy_bfq);
#else #else
spin_lock_irq(&bfqd->lock); spin_lock_irq(&bfqd->lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment