From: Keith Busch <keith.busch@intel.com>
Date: Thu, 18 Jun 2015 19:36:40 +0000 (-0600)
Subject: NVMe: Fix filesystem deadlock on removal
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3399a3f7464a624db1b365dbce0fef0ef4636c05;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

NVMe: Fix filesystem deadlock on removal

Move gendisk deletion before controller shutdown so filesystem may sync
dirty pages. Before, this would deadlock trying to allocate requests
on frozen queues that are about to be deleted.

Signed-off-by: Keith Busch <keith.busch@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 22761a6c34aa..75a914914c41 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -3124,8 +3124,8 @@ static void nvme_remove(struct pci_dev *pdev)
 	flush_work(&dev->reset_work);
 	flush_work(&dev->scan_work);
 	device_remove_file(dev->device, &dev_attr_reset_controller);
-	nvme_dev_shutdown(dev);
 	nvme_dev_remove(dev);
+	nvme_dev_shutdown(dev);
 	nvme_dev_remove_admin(dev);
 	device_destroy(nvme_class, MKDEV(nvme_char_major, dev->instance));
 	nvme_free_queues(dev, 0);