Commit 96ef1be5 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme-pci: put the admin queue in nvme_dev_remove_admin 



Once the controller is shutdown no one can access the admin queue.  Tear
it down in nvme_dev_remove_admin, which matches the flow in the other
drivers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Tested-by Gerd Bayer <gbayer@linxu.ibm.com>
parent 86adbf0c

drivers/nvme/host/pci.c

+1 −2
Original line number Diff line number Diff line
@@ -1747,6 +1747,7 @@ static void nvme_dev_remove_admin(struct nvme_dev *dev) 
		 */

		nvme_start_admin_queue(&dev->ctrl);

		blk_mq_destroy_queue(dev->ctrl.admin_q);

		blk_put_queue(dev->ctrl.admin_q);

		blk_mq_free_tag_set(&dev->admin_tagset);

	}

}
@@ -2774,8 +2775,6 @@ static void nvme_pci_free_ctrl(struct nvme_ctrl *ctrl) 


	nvme_dbbuf_dma_free(dev);

	nvme_free_tagset(dev);

	if (dev->ctrl.admin_q)

		blk_put_queue(dev->ctrl.admin_q);

	mempool_destroy(dev->iod_mempool);

	put_device(dev->dev);

	kfree(dev->queues);