Commit 87c971de authored by Kemeng Shi's avatar Kemeng Shi Committed by Jens Axboe
Browse files

block, bfq: remove unnecessary goto tag in bfq_dispatch_rq_from_bfqq 



We jump to tag only for returning current rq. Return directly to
remove this tag.

Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Signed-off-by: default avatarKemeng Shi <shikemeng@huaweicloud.com>
Link: https://lore.kernel.org/r/20230116095153.3810101-8-shikemeng@huaweicloud.com


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

block/bfq-iosched.c

+3 −6
Original line number Diff line number Diff line
@@ -5120,7 +5120,7 @@ static struct request *bfq_dispatch_rq_from_bfqq(struct bfq_data *bfqd, 
	bfq_dispatch_remove(bfqd->queue, rq);



	if (bfqq != bfqd->in_service_queue)

		goto return_rq;

		return rq;



	/*

	 * If weight raising has to terminate for bfqq, then next
@@ -5140,12 +5140,9 @@ static struct request *bfq_dispatch_rq_from_bfqq(struct bfq_data *bfqd, 
	 * belongs to CLASS_IDLE and other queues are waiting for

	 * service.

	 */

	if (!(bfq_tot_busy_queues(bfqd) > 1 && bfq_class_idle(bfqq)))

		goto return_rq;



	if (bfq_tot_busy_queues(bfqd) > 1 && bfq_class_idle(bfqq))

		bfq_bfqq_expire(bfqd, bfqq, false, BFQQE_BUDGET_EXHAUSTED);



return_rq:

	return rq;

}