diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-01-09 12:22:35 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-01-09 12:22:35 -0700 |
| commit | ef60a7313facab4df1051c4cda2d48b0d143ed71 (patch) | |
| tree | 441c50b9316d870c0d928d21651a2005bd5524c5 /block | |
| parent | f4c06e1d3d660bd30bd52e3df261ac08e426918b (diff) | |
| parent | 8abef10b3de1144cfe968f454946f13eb1ac3d0a (diff) | |
Merge branch 'for-4.16/block' into for-next
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 7c0b7f60811c..5e6f837f663e 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); |