diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-01-09 12:20:51 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-01-09 12:22:28 -0700 |
| commit | 8abef10b3de1144cfe968f454946f13eb1ac3d0a (patch) | |
| tree | f62cf163845beea344e0779bf2e6370b471926fb /block | |
| parent | 3609c471a1b86bffc812d8a2f0299892aa11a5e6 (diff) | |
| download | linux-0-day-8abef10b3de1144cfe968f454946f13eb1ac3d0a.tar.gz linux-0-day-8abef10b3de1144cfe968f454946f13eb1ac3d0a.tar.xz | |
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: 0d52af590552 ("block, bfq: release oom-queue ref to root group on exit")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/bfq-iosched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 7c0b7f60811cf..5e6f837f663e2 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -4893,10 +4893,10 @@ static void bfq_exit_queue(struct elevator_queue *e) hrtimer_cancel(&bfqd->idle_slice_timer); +#ifdef CONFIG_BFQ_GROUP_IOSCHED /* release oom-queue reference to root group */ bfqg_and_blkg_put(bfqd->root_group); -#ifdef CONFIG_BFQ_GROUP_IOSCHED blkcg_deactivate_policy(bfqd->queue, &blkcg_policy_bfq); #else spin_lock_irq(&bfqd->lock); |