From: Indraneel M Date: Thu, 11 Dec 2014 15:24:18 +0000 (-0700) Subject: NVMe: Fix FS mount issue (hot-remove followed by hot-add) X-Git-Tag: firefly_0821_release~176^2~2686^2~2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=285dffc9101244ac65c29672a1fb3fe614b52238;p=firefly-linux-kernel-4.4.55.git NVMe: Fix FS mount issue (hot-remove followed by hot-add) After Hot-remove of a device with a mounted partition, when the device is hot-added again, the new node reappears as nvme0n1. Mounting this new node fails with the error: mount: mount /dev/nvme0n1p1 on /mnt failed: File exists. The old nodes's FS entries still exist and the kernel can't re-create procfs and sysfs entries for the new node with the same name. The patch fixes this issue. Acked-by: Keith Busch Signed-off-by: Indraneel M Signed-off-by: Jens Axboe --- diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index 2cc2cee7a367..95f2310255ce 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -2493,6 +2493,7 @@ static void nvme_free_dev(struct kref *kref) pci_dev_put(dev->pci_dev); nvme_free_namespaces(dev); + nvme_release_instance(dev); blk_mq_free_tag_set(&dev->tagset); kfree(dev->queues); kfree(dev->entry); @@ -2780,7 +2781,6 @@ static void nvme_remove(struct pci_dev *pdev) nvme_dev_remove_admin(dev); nvme_free_queues(dev, 0); nvme_free_admin_tags(dev); - nvme_release_instance(dev); nvme_release_prp_pools(dev); kref_put(&dev->kref, nvme_free_dev); }