lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block, bfq: remove ifdefs from around gets/puts of bfq groups

Browse Source 
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Paolo Valente 2020-02-03 11:40:58 +01:00 committed by Greg Kroah-Hartman
parent 92ed51e651
commit e28c9b3caf
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block/bfq-cgroup.c
View File

@ -1388,6 +1388,10 @@ struct bfq_group *bfqq_group(struct bfq_queue *bfqq)
return bfqq->bfqd->root_group; 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 *bfq_create_group_hierarchy(struct bfq_data *bfqd, int node)
{ {
struct bfq_group *bfqg; struct bfq_group *bfqg;

6
block/bfq-iosched.c
View File

@ -4826,9 +4826,7 @@ void bfq_put_queue(struct bfq_queue *bfqq)
{ {
struct bfq_queue *item; struct bfq_queue *item;
struct hlist_node *n; struct hlist_node *n;
#ifdef CONFIG_BFQ_GROUP_IOSCHED
struct bfq_group *bfqg = bfqq_group(bfqq); struct bfq_group *bfqg = bfqq_group(bfqq);
#endif
if (bfqq->bfqd) if (bfqq->bfqd)
bfq_log_bfqq(bfqq->bfqd, bfqq, "put_queue: %p %d", bfq_log_bfqq(bfqq->bfqd, bfqq, "put_queue: %p %d",
@ -4901,9 +4899,7 @@ void bfq_put_queue(struct bfq_queue *bfqq)
bfqq->bfqd->last_completed_rq_bfqq = NULL; bfqq->bfqd->last_completed_rq_bfqq = NULL;
kmem_cache_free(bfq_pool, bfqq); kmem_cache_free(bfq_pool, bfqq);
#ifdef CONFIG_BFQ_GROUP_IOSCHED
bfqg_and_blkg_put(bfqg); bfqg_and_blkg_put(bfqg);
#endif
} }
static void bfq_put_cooperator(struct bfq_queue *bfqq) static void bfq_put_cooperator(struct bfq_queue *bfqq)
@ -6387,10 +6383,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);

1
block/bfq-iosched.h
View File

@ -916,6 +916,7 @@ struct bfq_group {
#else #else
struct bfq_group { struct bfq_group {
struct bfq_entity entity;
struct bfq_sched_data sched_data; struct bfq_sched_data sched_data;
struct bfq_queue *async_bfqq[2][IOPRIO_BE_NR]; struct bfq_queue *async_bfqq[2][IOPRIO_BE_NR];