Commit 6db28eda authored Feb 10, 2017 by Keith Busch Committed by Jens Axboe Feb 22, 2017

nvme/pci: Disable on removal when disconnected



If the device is not present, the driver should disable the queues
immediately. Prior to this, the driver was relying on the watchdog timer
to kill the queues if requests were outstanding to the device, and that
just delays removal up to one second.

Signed-off-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@fb.com>

parent c5552fde

drivers/nvme/host/pci.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -2001,8 +2001,10 @@ static void nvme_remove(struct pci_dev *pdev)

		pci_set_drvdata(pdev, NULL);

		if (!pci_device_is_present(pdev))
		if (!pci_device_is_present(pdev)) {
		nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_DEAD);
		nvme_dev_disable(dev, false);
		}

		flush_work(&dev->reset_work);
		nvme_uninit_ctrl(&dev->ctrl);

Admin message