Commit d322f355 authored by Yu Kuai's avatar Yu Kuai Committed by Jens Axboe
Browse files

block, bfq: remove useless parameter for bfq_add/del_bfqq_busy() 



'bfqd' can be accessed through 'bfqq->bfqd', there is no need to pass
it as a parameter separately.

Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20220816015631.1323948-4-yukuai1@huaweicloud.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 1e3cc212

block/bfq-iosched.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1925,7 +1925,7 @@ static void bfq_bfqq_handle_idle_busy_switch(struct bfq_data *bfqd, 
	bfqq->service_from_backlogged = 0;

	bfqq->service_from_backlogged = 0;

	bfq_clear_bfqq_softrt_update(bfqq);

	bfq_clear_bfqq_softrt_update(bfqq);





	bfq_add_bfqq_busy(bfqd, bfqq);

	bfq_add_bfqq_busy(bfqq);





	/*

	/*

	 * Expire in-service queue if preemption may be needed for

	 * Expire in-service queue if preemption may be needed for
@@ -2419,7 +2419,7 @@ static void bfq_remove_request(struct request_queue *q, 
		bfqq->next_rq = NULL;

		bfqq->next_rq = NULL;





		if (bfq_bfqq_busy(bfqq) && bfqq != bfqd->in_service_queue) {

		if (bfq_bfqq_busy(bfqq) && bfqq != bfqd->in_service_queue) {

			bfq_del_bfqq_busy(bfqd, bfqq, false);

			bfq_del_bfqq_busy(bfqq, false);

			/*

			/*

			 * bfqq emptied. In normal operation, when

			 * bfqq emptied. In normal operation, when

			 * bfqq is empty, bfqq->entity.service and

			 * bfqq is empty, bfqq->entity.service and
@@ -3098,7 +3098,7 @@ void bfq_release_process_ref(struct bfq_data *bfqd, struct bfq_queue *bfqq) 
	 */

	 */

	if (bfq_bfqq_busy(bfqq) && RB_EMPTY_ROOT(&bfqq->sort_list) &&

	if (bfq_bfqq_busy(bfqq) && RB_EMPTY_ROOT(&bfqq->sort_list) &&

	    bfqq != bfqd->in_service_queue)

	    bfqq != bfqd->in_service_queue)

		bfq_del_bfqq_busy(bfqd, bfqq, false);

		bfq_del_bfqq_busy(bfqq, false);





	bfq_reassign_last_bfqq(bfqq, NULL);

	bfq_reassign_last_bfqq(bfqq, NULL);
@@ -3908,7 +3908,7 @@ static bool __bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq, 
			 */

			 */

			bfqq->budget_timeout = jiffies;

			bfqq->budget_timeout = jiffies;





		bfq_del_bfqq_busy(bfqd, bfqq, true);

		bfq_del_bfqq_busy(bfqq, true);

	} else {

	} else {

		bfq_requeue_bfqq(bfqd, bfqq, true);

		bfq_requeue_bfqq(bfqd, bfqq, true);

		/*

		/*

block/bfq-iosched.h

+2 −3
Original line number Original line Diff line number Diff line
@@ -1080,9 +1080,8 @@ void bfq_deactivate_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq, 
void bfq_activate_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq);

void bfq_activate_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq);

void bfq_requeue_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,

void bfq_requeue_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,

		      bool expiration);

		      bool expiration);

void bfq_del_bfqq_busy(struct bfq_data *bfqd, struct bfq_queue *bfqq,

void bfq_del_bfqq_busy(struct bfq_queue *bfqq, bool expiration);

		       bool expiration);

void bfq_add_bfqq_busy(struct bfq_queue *bfqq);

void bfq_add_bfqq_busy(struct bfq_data *bfqd, struct bfq_queue *bfqq);





/* --------------- end of interface of B-WF2Q+ ---------------- */

/* --------------- end of interface of B-WF2Q+ ---------------- */

block/bfq-wf2q.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -1651,9 +1651,10 @@ void bfq_requeue_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq, 
 * the service tree. As a special case, it can be invoked during an

 * the service tree. As a special case, it can be invoked during an

 * expiration.

 * expiration.

 */

 */

void bfq_del_bfqq_busy(struct bfq_data *bfqd, struct bfq_queue *bfqq,

void bfq_del_bfqq_busy(struct bfq_queue *bfqq, bool expiration)

		       bool expiration)

{

{

	struct bfq_data *bfqd = bfqq->bfqd;



	bfq_log_bfqq(bfqd, bfqq, "del from busy");

	bfq_log_bfqq(bfqd, bfqq, "del from busy");





	bfq_clear_bfqq_busy(bfqq);

	bfq_clear_bfqq_busy(bfqq);
@@ -1674,8 +1675,10 @@ void bfq_del_bfqq_busy(struct bfq_data *bfqd, struct bfq_queue *bfqq, 
/*

/*

 * Called when an inactive queue receives a new request.

 * Called when an inactive queue receives a new request.

 */

 */

void bfq_add_bfqq_busy(struct bfq_data *bfqd, struct bfq_queue *bfqq)

void bfq_add_bfqq_busy(struct bfq_queue *bfqq)

{

{

	struct bfq_data *bfqd = bfqq->bfqd;



	bfq_log_bfqq(bfqd, bfqq, "add to busy");

	bfq_log_bfqq(bfqd, bfqq, "add to busy");





	bfq_activate_bfqq(bfqd, bfqq);

	bfq_activate_bfqq(bfqd, bfqq);