nvme: tighten up state check for namespace scanning

We only should be scanning namespaces if the controller is live.  Currently
we call the function just before setting it live, so fix the code up to
move the call to nvme_queue_scan to just below the state change.

Signed-off-by: Christoph Hellwig <[email protected]>
Reviewed-by: Sagi Grimberg <[email protected]>
Acked-by Jon Derrick: <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 0cee23651aa7c388c6c710612e4786ad73008105..9b2deba0bc91d5cdfb9ca5fb9b3ea7ebfe62cfb4 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -272,7 +272,7 @@ static void nvme_queue_scan(struct nvme_dev *dev)
         * Do not queue new scan work when a controller is reset during
         * removal.
         */
-       if (dev->ctrl.state != NVME_CTRL_DELETING)
+       if (dev->ctrl.state == NVME_CTRL_LIVE)
                queue_work(nvme_workq, &dev->scan_work);
 }
 
@@ -1659,7 +1659,6 @@ static int nvme_dev_add(struct nvme_dev *dev)
                nvme_free_queues(dev, dev->online_queues);
        }
 
-       nvme_queue_scan(dev);
        return 0;
 }
 
@@ -1893,6 +1892,9 @@ static void nvme_reset_work(struct work_struct *work)
                dev_warn(dev->ctrl.device, "failed to mark controller live\n");
                goto out;
        }
+
+       if (dev->online_queues > 1)
+               nvme_queue_scan(dev);
        return;
 
  out: