summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Busch <keith.busch@intel.com>2014-06-23 15:24:53 -0600
committerJens Axboe <axboe@fb.com>2014-11-04 13:17:07 -0700
commitc81f49758a677e878df4e6a33f29d8ce401bf66d (patch)
tree2eabaab7028bd9a18a554914cad42e0c241c4904
parentbadc34d4154de81b965629a5c3110e058eb8ca2b (diff)
downloadlinux-c81f49758a677e878df4e6a33f29d8ce401bf66d.tar.gz
linux-c81f49758a677e878df4e6a33f29d8ce401bf66d.tar.bz2
linux-c81f49758a677e878df4e6a33f29d8ce401bf66d.zip
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>
-rw-r--r--drivers/block/nvme-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index f3103aa91d2e..48a712734b55 100644
--- 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;
}