Avoid that nvme_queue_rq() is still running when nvme_stop_queues()
returns.

Signed-off-by: Bart Van Assche <bart.vanass...@sandisk.com>
Cc: Keith Busch <keith.bu...@intel.com>
Cc: Sagi Grimberg <s...@grimberg.me>
Cc: Christoph Hellwig <h...@lst.de>
---
 drivers/nvme/host/core.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 18a265d..96f00c7 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -201,13 +201,7 @@ static struct nvme_ns *nvme_get_ns_from_disk(struct 
gendisk *disk)
 
 void nvme_requeue_req(struct request *req)
 {
-       unsigned long flags;
-
-       blk_mq_requeue_request(req, false);
-       spin_lock_irqsave(req->q->queue_lock, flags);
-       if (!blk_mq_queue_stopped(req->q))
-               blk_mq_kick_requeue_list(req->q);
-       spin_unlock_irqrestore(req->q->queue_lock, flags);
+       blk_mq_requeue_request(req, true);
 }
 EXPORT_SYMBOL_GPL(nvme_requeue_req);
 
@@ -2074,11 +2068,14 @@ EXPORT_SYMBOL_GPL(nvme_kill_queues);
 void nvme_stop_queues(struct nvme_ctrl *ctrl)
 {
        struct nvme_ns *ns;
+       struct request_queue *q;
 
        mutex_lock(&ctrl->namespaces_mutex);
        list_for_each_entry(ns, &ctrl->namespaces, list) {
-               blk_mq_cancel_requeue_work(ns->queue);
-               blk_mq_stop_hw_queues(ns->queue);
+               q = ns->queue;
+               blk_mq_cancel_requeue_work(q);
+               blk_mq_stop_hw_queues(q);
+               blk_mq_quiesce_queue(q);
        }
        mutex_unlock(&ctrl->namespaces_mutex);
 }
-- 
2.10.1

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to