Commit 7dcebef9 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

nvme-pci: remove an extra queue reference 



Now that blk_mq_destroy_queue does not release the queue reference, there
is no need for a second admin queue reference to be held by the nvme_dev.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Link: https://lore.kernel.org/r/20221018135720.670094-4-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent dc917c36

drivers/nvme/host/pci.c

+0 −6
Original line number Diff line number Diff line
@@ -1749,7 +1749,6 @@ 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);

	}

}
@@ -1778,11 +1777,6 @@ static int nvme_pci_alloc_admin_tag_set(struct nvme_dev *dev) 
		dev->ctrl.admin_q = NULL;

		return -ENOMEM;

	}

	if (!blk_get_queue(dev->ctrl.admin_q)) {

		nvme_dev_remove_admin(dev);

		dev->ctrl.admin_q = NULL;

		return -ENODEV;

	}

	return 0;

}