NVMe: Use pci_stop_and_remove_bus_device_locked()

Race conditions are theoretically possible between the NVMe PCI device
removal and the generic PCI bus rescan and device removal that can be
triggered via sysfs.

To avoid those race conditions make the NVMe code use
pci_stop_and_remove_bus_device_locked().

Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index f3103aa91d2e8b6e03e5aa48449544b98317ae07..48a712734b5591e47f9d26af333102afa8da2126 100644 (file)
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -2759,7 +2759,7 @@ static int nvme_remove_dead_ctrl(void *arg)
        struct pci_dev *pdev = dev->pci_dev;
 
        if (pci_get_drvdata(pdev))
-               pci_stop_and_remove_bus_device(pdev);
+               pci_stop_and_remove_bus_device_locked(pdev);
        kref_put(&dev->kref, nvme_free_dev);
        return 0;
 }