2 files changed, 10 insertions, 3 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index ce12515f9b9b..deb56932f8c4 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -798,9 +798,8 @@ void blk_cleanup_queue(struct request_queue *q)
          * dispatch may still be in-progress since we dispatch requests
          * from more than one contexts.
          *
-         * No need to quiesce queue if it isn't initialized yet since
-         * blk_freeze_queue() should be enough for cases of passthrough
-         * request.
+         * We rely on driver to deal with the race in case that queue
+         * initialization isn't done.
          */
         if (q->mq_ops && blk_queue_init_done(q))
                 blk_mq_quiesce_queue(q);
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index c7fccbb8f554..fa6e0c3b3aa6 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -697,6 +697,12 @@ static bool scsi_end_request(struct request *req, blk_status_t error,
                  */
                 scsi_mq_uninit_cmd(cmd);
 
+                /*
+                 * queue is still alive, so grab the ref for preventing it
+                 * from being cleaned up during running queue.
+                 */
+                percpu_ref_get(&q->q_usage_counter);
+
                 __blk_mq_end_request(req, error);
 
                 if (scsi_target(sdev)->single_lun ||
@@ -704,6 +710,8 @@ static bool scsi_end_request(struct request *req, blk_status_t error,
                         kblockd_schedule_work(&sdev->requeue_work);
                 else
                         blk_mq_run_hw_queues(q, true);
+
+                percpu_ref_put(&q->q_usage_counter);
         } else {
                 unsigned long flags;