Commit 34b6c231 authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Christoph Hellwig
Browse files

nvme: Add admin_tagset pointer to nvme_ctrl 



Will be used when we centralize control flows.

Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 90af3512

drivers/nvme/host/fc.c

+1 −0
Original line number Diff line number Diff line
@@ -2731,6 +2731,7 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, 
	ret = blk_mq_alloc_tag_set(&ctrl->admin_tag_set);

	if (ret)

		goto out_free_queues;

	ctrl->ctrl.admin_tagset = &ctrl->admin_tag_set;



	ctrl->ctrl.admin_q = blk_mq_init_queue(&ctrl->admin_tag_set);

	if (IS_ERR(ctrl->ctrl.admin_q)) {

drivers/nvme/host/nvme.h

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ struct nvme_ctrl { 
	struct kref kref;

	int instance;

	struct blk_mq_tag_set *tagset;

	struct blk_mq_tag_set *admin_tagset;

	struct list_head namespaces;

	struct mutex namespaces_mutex;

	struct device *device;	/* char device */

drivers/nvme/host/pci.c

+1 −0
Original line number Diff line number Diff line
@@ -1376,6 +1376,7 @@ static int nvme_alloc_admin_tags(struct nvme_dev *dev) 


		if (blk_mq_alloc_tag_set(&dev->admin_tagset))

			return -ENOMEM;

		dev->ctrl.admin_tagset = &dev->admin_tagset;



		dev->ctrl.admin_q = blk_mq_init_queue(&dev->admin_tagset);

		if (IS_ERR(dev->ctrl.admin_q)) {

drivers/nvme/host/rdma.c

+1 −0
Original line number Diff line number Diff line
@@ -691,6 +691,7 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl) 
	error = blk_mq_alloc_tag_set(&ctrl->admin_tag_set);

	if (error)

		goto out_put_dev;

	ctrl->ctrl.admin_tagset = &ctrl->admin_tag_set;



	ctrl->ctrl.admin_q = blk_mq_init_queue(&ctrl->admin_tag_set);

	if (IS_ERR(ctrl->ctrl.admin_q)) {

drivers/nvme/target/loop.c

+1 −0
Original line number Diff line number Diff line
@@ -375,6 +375,7 @@ static int nvme_loop_configure_admin_queue(struct nvme_loop_ctrl *ctrl) 
	error = blk_mq_alloc_tag_set(&ctrl->admin_tag_set);

	if (error)

		goto out_free_sq;

	ctrl->ctrl.admin_tagset = &ctrl->admin_tag_set;



	ctrl->ctrl.admin_q = blk_mq_init_queue(&ctrl->admin_tag_set);

	if (IS_ERR(ctrl->ctrl.admin_q)) {