[V9,7/7] block: don't drain in-progress dispatch in blk_cleanup_queue()

Commit Message

Ming Lei April 30, 2019, 1:52 a.m. UTC

Now freeing hw queue resource is moved to hctx's release handler,
we don't need to worry about the race between blk_cleanup_queue and
run queue any more.

So don't drain in-progress dispatch in blk_cleanup_queue().

This is basically revert of c2856ae2f315 ("blk-mq: quiesce queue before
freeing queue").

Cc: Dongli Zhang <[e-mail]>
Cc: James Smart <[e-mail]>
Cc: Bart Van Assche <[e-mail]>
Cc: [e-mail],
Cc: Martin K . Petersen <[e-mail]>,
Cc: Christoph Hellwig <[e-mail]>,
Cc: James E . J . Bottomley <[e-mail]>,
Reviewed-by: Bart Van Assche <[e-mail]>
Reviewed-by: Hannes Reinecke <[e-mail]>
Tested-by: James Smart <[e-mail]>
Signed-off-by: Ming Lei <[e-mail]>
---
 block/blk-core.c | 12 ------------
 1 file changed, 12 deletions(-)

Patch

diff --git a/block/blk-core.c b/block/blk-core.c
index f5b5f21ae4fd..e24cfcefdc19 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -338,18 +338,6 @@  void blk_cleanup_queue(struct request_queue *q)
 
 	blk_queue_flag_set(QUEUE_FLAG_DEAD, q);
 
-	/*
-	 * make sure all in-progress dispatch are completed because
-	 * blk_freeze_queue() can only complete all requests, and
-	 * dispatch may still be in-progress since we dispatch requests
-	 * from more than one contexts.
-	 *
-	 * We rely on driver to deal with the race in case that queue
-	 * initialization isn't done.
-	 */
-	if (queue_is_mq(q) && blk_queue_init_done(q))
-		blk_mq_quiesce_queue(q);
-
 	/* for synchronous bio-based driver finish in-flight integrity i/o */
 	blk_flush_integrity();