block: don't drain in-progress dispatch in blk_cleanup_queue()

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 <dongli.zhang@oracle.com>
Cc: James Smart <james.smart@broadcom.com>
Cc: Bart Van Assche <bart.vanassche@wdc.com>
Cc: linux-scsi@vger.kernel.org,
Cc: Martin K . Petersen <martin.petersen@oracle.com>,
Cc: Christoph Hellwig <hch@lst.de>,
Cc: James E . J . Bottomley <jejb@linux.vnet.ibm.com>,
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Tested-by: James Smart <james.smart@broadcom.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-core.c b/block/blk-core.c
index 6722b24a1182ccdb07e34c54c9f6e290a420e90b..419d600e6637b3f2476f7de971853e8153c2c4e8 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -339,18 +339,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();