aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Busch <keith.busch@intel.com>2018-06-06 10:13:08 -0400
committerJens Axboe <axboe@kernel.dk>2018-06-08 14:51:11 -0400
commit1d39e6928cbd0eb737c51545210b5186d5551ba1 (patch)
tree06b5ba3d349841804782a7d191d1348f1909b430
parentfe76fcfb91a97eccf20cec17ff05a27b8d5b0801 (diff)
nvme-pci: unquiesce dead controller queues
This patch ensures the nvme namsepace request queues are not quiesced on a surprise removal. It's possible the queues were previously killed in a failed reset, so the queues need to be unquiesced to ensure all requests are flushed to completion. Signed-off-by: Keith Busch <keith.busch@intel.com> Reviewed-by: Sagi Grimberg <sagi@grimberg.me> Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--drivers/nvme/host/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 7f8b1bd03db4..d935aba0288f 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2599,7 +2599,7 @@ static void nvme_remove(struct pci_dev *pdev)
2599 2599
2600 if (!pci_device_is_present(pdev)) { 2600 if (!pci_device_is_present(pdev)) {
2601 nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_DEAD); 2601 nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_DEAD);
2602 nvme_dev_disable(dev, false); 2602 nvme_dev_disable(dev, true);
2603 } 2603 }
2604 2604
2605 flush_work(&dev->ctrl.reset_work); 2605 flush_work(&dev->ctrl.reset_work);