2022-10-30 08:55:07

by Jinlong Chen

Subject: [PATCH] blk-mq: remove redundant call to blk_freeze_queue_start in blk_mq_destroy_queue

The calling relationship in blk_mq_destroy_queue() is as follows:

blk_mq_destroy_queue()
...
-> blk_queue_start_drain()
-> blk_freeze_queue_start() <- called
...
-> blk_freeze_queue()
-> blk_freeze_queue_start() <- called again
-> blk_mq_freeze_queue_wait()
...

So there is a redundant call to blk_freeze_queue_start().

Replace blk_freeze_queue() with blk_mq_freeze_queue_wait() to avoid the
redundant call.

Signed-off-by: Jinlong Chen <[email protected]>
---
block/blk-mq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 4cecf281123f..8ca49530bdf3 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -4005,7 +4005,7 @@ void blk_mq_destroy_queue(struct request_queue *q)

blk_queue_flag_set(QUEUE_FLAG_DYING, q);
blk_queue_start_drain(q);
- blk_freeze_queue(q);
+ blk_mq_freeze_queue_wait(q);

blk_sync_queue(q);
blk_mq_cancel_work_sync(q);
--
2.31.1

2022-10-30 09:10:53

by Christoph Hellwig

Subject: Re: [PATCH] blk-mq: remove redundant call to blk_freeze_queue_start in blk_mq_destroy_queue

Looks good:

Reviewed-by: Christoph Hellwig <[email protected]>

2022-10-31 13:48:40

by Jens Axboe

Subject: Re: [PATCH] blk-mq: remove redundant call to blk_freeze_queue_start in blk_mq_destroy_queue

On Sun, 30 Oct 2022 16:32:12 +0800, Jinlong Chen wrote:
> The calling relationship in blk_mq_destroy_queue() is as follows:
>
> blk_mq_destroy_queue()
> ...
> -> blk_queue_start_drain()
> -> blk_freeze_queue_start() <- called
> ...
> -> blk_freeze_queue()
> -> blk_freeze_queue_start() <- called again
> -> blk_mq_freeze_queue_wait()
> ...
>
> [...]

Applied, thanks!

[1/1] blk-mq: remove redundant call to blk_freeze_queue_start in blk_mq_destroy_queue
commit: 56c1ee92246a5099a626b955dd7f6636cdce6f93

Best regards,
--
Jens Axboe