Patch "nvme/pci: Disable on removal when disconnected" has been added to the 4.10-stable tree

This is a note to let you know that I've just added the patch titled

nvme/pci: Disable on removal when disconnected

to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
nvme-pci-disable-on-removal-when-disconnected.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Keith Busch <[email protected]>
Date: Fri, 10 Feb 2017 18:15:49 -0500
Subject: nvme/pci: Disable on removal when disconnected

From: Keith Busch <[email protected]>

commit 6db28eda266052f86a6b402422de61eeb7d2e351 upstream.

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.

---
 drivers/nvme/host/pci.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

@@ -1990,8 +1990,10 @@ static void nvme_remove(struct pci_dev *
 
 	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);

Patches currently in stable-queue which might be from [email protected] are

queue-4.10/nvme-pci-disable-on-removal-when-disconnected.patch queue-4.10/nvme-core-fix-race-kicking-freed-request_queue.patch