| From 263f2e0f7f313794d013c64c7a194b1532d622a0 Mon Sep 17 00:00:00 2001 |
| From: Paolo Valente <paolo.valente@linaro.org> |
| Date: Mon, 3 Feb 2020 11:40:58 +0100 |
| Subject: [PATCH] block, bfq: remove ifdefs from around gets/puts of bfq groups |
| |
| commit 4d8340d0d4d90e7ca367d18ec16c2fefa89a339c upstream. |
| |
| ifdefs around gets and puts of bfq groups reduce readability, remove them. |
| |
| Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name> |
| Reported-by: Jens Axboe <axboe@kernel.dk> |
| Signed-off-by: Paolo Valente <paolo.valente@linaro.org> |
| Signed-off-by: Jens Axboe <axboe@kernel.dk> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c |
| index b1c435208a47..0ad66e52ce19 100644 |
| --- a/block/bfq-cgroup.c |
| +++ b/block/bfq-cgroup.c |
| @@ -1216,6 +1216,10 @@ struct bfq_group *bfqq_group(struct bfq_queue *bfqq) |
| return bfqq->bfqd->root_group; |
| } |
| |
| +void bfqg_and_blkg_get(struct bfq_group *bfqg) {} |
| + |
| +void bfqg_and_blkg_put(struct bfq_group *bfqg) {} |
| + |
| struct bfq_group *bfq_create_group_hierarchy(struct bfq_data *bfqd, int node) |
| { |
| struct bfq_group *bfqg; |
| diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c |
| index 40734cf8befe..2e5ec2684332 100644 |
| --- a/block/bfq-iosched.c |
| +++ b/block/bfq-iosched.c |
| @@ -4522,9 +4522,7 @@ static struct request *bfq_dispatch_request(struct blk_mq_hw_ctx *hctx) |
| */ |
| void bfq_put_queue(struct bfq_queue *bfqq) |
| { |
| -#ifdef CONFIG_BFQ_GROUP_IOSCHED |
| struct bfq_group *bfqg = bfqq_group(bfqq); |
| -#endif |
| |
| if (bfqq->bfqd) |
| bfq_log_bfqq(bfqq->bfqd, bfqq, "put_queue: %p %d", |
| @@ -4567,9 +4565,7 @@ void bfq_put_queue(struct bfq_queue *bfqq) |
| } |
| |
| kmem_cache_free(bfq_pool, bfqq); |
| -#ifdef CONFIG_BFQ_GROUP_IOSCHED |
| bfqg_and_blkg_put(bfqg); |
| -#endif |
| } |
| |
| static void bfq_put_cooperator(struct bfq_queue *bfqq) |
| @@ -5953,10 +5949,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); |
| diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h |
| index eb3ac95fdbf9..777dd8136f32 100644 |
| --- a/block/bfq-iosched.h |
| +++ b/block/bfq-iosched.h |
| @@ -885,6 +885,7 @@ struct bfq_group { |
| |
| #else |
| struct bfq_group { |
| + struct bfq_entity entity; |
| struct bfq_sched_data sched_data; |
| |
| struct bfq_queue *async_bfqq[2][IOPRIO_BE_NR]; |
| -- |
| 2.7.4 |
| |
