Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e28c9b3c authored by Paolo Valente's avatar Paolo Valente Committed by Greg Kroah-Hartman
Browse files

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: default avatarOleksandr Natalenko <oleksandr@natalenko.name>
Reported-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarPaolo Valente <paolo.valente@linaro.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 92ed51e6

block/bfq-cgroup.c

+4 −0
Original line number Diff line number Diff line
@@ -1388,6 +1388,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;

block/bfq-iosched.c

+1 −5
Original line number Diff line number Diff line
@@ -4826,9 +4826,7 @@ void bfq_put_queue(struct bfq_queue *bfqq) 
{

	struct bfq_queue *item;

	struct hlist_node *n;

#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",
@@ -4901,9 +4899,7 @@ void bfq_put_queue(struct bfq_queue *bfqq) 
		bfqq->bfqd->last_completed_rq_bfqq = NULL;



	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)
@@ -6387,10 +6383,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);

block/bfq-iosched.h

+1 −0
Original line number Diff line number Diff line
@@ -916,6 +916,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];