2022-06-25 15:25:43

by Liu Song

Subject: [PATCH] blk-mq: blk_mq_tag_busy is no need to return a value

From: Liu Song <[email protected]>

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: Liu Song <[email protected]>
---
block/blk-mq-tag.c | 18 +++++++-----------
block/blk-mq-tag.h | 10 ++++------
2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
index 2dcd738..3cfffef 100644
--- a/block/blk-mq-tag.c
+++ b/block/blk-mq-tag.c
@@ -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;
}

/*
diff --git a/block/blk-mq-tag.h b/block/blk-mq-tag.h
index 5668e28..91ff37e 100644
--- a/block/blk-mq-tag.h
+++ b/block/blk-mq-tag.h
@@ -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)
--
1.8.3.1

2022-06-25 17:35:47

by Jens Axboe

Subject: Re: [PATCH] blk-mq: blk_mq_tag_busy is no need to return a value

On Sat, 25 Jun 2022 23:15:21 +0800, Liu Song wrote:
> From: Liu Song <[email protected]>
>
> Currently "blk_mq_tag_busy" return value has no effect, so adjust it.
> Some code implementations have also been adjusted to enhance
> readability.
>
>
> [...]

Applied, thanks!

[1/1] blk-mq: blk_mq_tag_busy is no need to return a value
commit: ddec07b1ea26063d77da908cbeb8146fe57d4370

Best regards,
--
Jens Axboe