]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
block: remove blk_freeze_queue()
authorMing Lei <ming.lei@redhat.com>
Thu, 31 Oct 2024 13:37:17 +0000 (21:37 +0800)
committerJens Axboe <axboe@kernel.dk>
Thu, 7 Nov 2024 23:27:22 +0000 (16:27 -0700)
No one use blk_freeze_queue(), so remove it and the obsolete comment.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20241031133723.303835-2-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-mq.c
block/blk.h

index 4ae7eb335fbdec5545308da131ba1c75374eacdc..5f4496220432ff27cace34ad0a05104d443d1c13 100644 (file)
@@ -161,31 +161,11 @@ int blk_mq_freeze_queue_wait_timeout(struct request_queue *q,
 }
 EXPORT_SYMBOL_GPL(blk_mq_freeze_queue_wait_timeout);
 
-/*
- * Guarantee no request is in use, so we can change any data structure of
- * the queue afterward.
- */
-void blk_freeze_queue(struct request_queue *q)
+void blk_mq_freeze_queue(struct request_queue *q)
 {
-       /*
-        * In the !blk_mq case we are only calling this to kill the
-        * q_usage_counter, otherwise this increases the freeze depth
-        * and waits for it to return to zero.  For this reason there is
-        * no blk_unfreeze_queue(), and blk_freeze_queue() is not
-        * exported to drivers as the only user for unfreeze is blk_mq.
-        */
        blk_freeze_queue_start(q);
        blk_mq_freeze_queue_wait(q);
 }
-
-void blk_mq_freeze_queue(struct request_queue *q)
-{
-       /*
-        * ...just an alias to keep freeze and unfreeze actions balanced
-        * in the blk_mq_* namespace
-        */
-       blk_freeze_queue(q);
-}
 EXPORT_SYMBOL_GPL(blk_mq_freeze_queue);
 
 bool __blk_mq_unfreeze_queue(struct request_queue *q, bool force_atomic)
index 63d5df0dc29c0578ae3f1efef0dcf706ebdcc0be..ac48b79cbf800e7a7d1c4ee4191d8f8e130bf780 100644 (file)
@@ -35,7 +35,6 @@ struct blk_flush_queue *blk_alloc_flush_queue(int node, int cmd_size,
                                              gfp_t flags);
 void blk_free_flush_queue(struct blk_flush_queue *q);
 
-void blk_freeze_queue(struct request_queue *q);
 bool __blk_mq_unfreeze_queue(struct request_queue *q, bool force_atomic);
 bool blk_queue_start_drain(struct request_queue *q);
 bool __blk_freeze_queue_start(struct request_queue *q);