Commit ee78ec10 authored by Liu Song's avatar Liu Song Committed by Jens Axboe
Browse files

blk-mq: blk_mq_tag_busy is no need to return a value 



Currently "blk_mq_tag_busy" return value has no effect, so adjust it.
Some code implementations have also been adjusted to enhance
readability.

Signed-off-by: default avatarLiu Song <liusong@linux.alibaba.com>
Link: https://lore.kernel.org/r/1656170121-1619-1-git-send-email-liusong@linux.alibaba.com


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

block/blk-mq-tag.c

+7 −11
Original line number Diff line number Diff line
@@ -37,29 +37,25 @@ static void blk_mq_update_wake_batch(struct blk_mq_tags *tags, 
 * to get tag when first time, the other shared-tag users could reserve

 * budget for it.

 */

bool __blk_mq_tag_busy(struct blk_mq_hw_ctx *hctx)

void __blk_mq_tag_busy(struct blk_mq_hw_ctx *hctx)

{

	unsigned int users;



	if (blk_mq_is_shared_tags(hctx->flags)) {

		struct request_queue *q = hctx->queue;



		if (test_bit(QUEUE_FLAG_HCTX_ACTIVE, &q->queue_flags) ||

		    test_and_set_bit(QUEUE_FLAG_HCTX_ACTIVE, &q->queue_flags)) {

			return true;

		}

		if (test_bit(QUEUE_FLAG_HCTX_ACTIVE, &q->queue_flags))

			return;

		set_bit(QUEUE_FLAG_HCTX_ACTIVE, &q->queue_flags);

	} else {

		if (test_bit(BLK_MQ_S_TAG_ACTIVE, &hctx->state) ||

		    test_and_set_bit(BLK_MQ_S_TAG_ACTIVE, &hctx->state)) {

			return true;

		}

		if (test_bit(BLK_MQ_S_TAG_ACTIVE, &hctx->state))

			return;

		set_bit(BLK_MQ_S_TAG_ACTIVE, &hctx->state);

	}



	users = atomic_inc_return(&hctx->tags->active_queues);



	blk_mq_update_wake_batch(hctx->tags, users);



	return true;

}



/*

block/blk-mq-tag.h

+4 −6
Original line number Diff line number Diff line
@@ -47,15 +47,13 @@ enum { 
	BLK_MQ_TAG_MAX		= BLK_MQ_NO_TAG - 1,

};



extern bool __blk_mq_tag_busy(struct blk_mq_hw_ctx *);

extern void __blk_mq_tag_busy(struct blk_mq_hw_ctx *);

extern void __blk_mq_tag_idle(struct blk_mq_hw_ctx *);



static inline bool blk_mq_tag_busy(struct blk_mq_hw_ctx *hctx)

static inline void blk_mq_tag_busy(struct blk_mq_hw_ctx *hctx)

{

	if (!(hctx->flags & BLK_MQ_F_TAG_QUEUE_SHARED))

		return false;



	return __blk_mq_tag_busy(hctx);

	if (hctx->flags & BLK_MQ_F_TAG_QUEUE_SHARED)

		__blk_mq_tag_busy(hctx);

}



static inline void blk_mq_tag_idle(struct blk_mq_hw_ctx *hctx)