From: Sagi Grimberg <sagi@grimberg.me>

Date: Mon, 10 Jul 2017 09:22:29 +0300

Subject: nvme: Add admin_tagset pointer to nvme_ctrl

Patch-mainline: v4.14-rc1

Git-commit: 34b6c2315eb66e6411261aa440f6e3c4cded3506

References: FATE#323952, FATE#322506

Will be used when we centralize control flows.

Signed-off-by: Sagi Grimberg <sagi@grimberg.me>

Signed-off-by: Christoph Hellwig <hch@lst.de>

Acked-by: Johannes Thumshirn <jthumshirn@suse.de>

---

 drivers/nvme/host/fc.c     |    1 +

 drivers/nvme/host/nvme.h   |    1 +

 drivers/nvme/host/pci.c    |    1 +

 drivers/nvme/host/rdma.c   |    1 +

 drivers/nvme/target/loop.c |    1 +

 5 files changed, 5 insertions(+)

--- a/drivers/nvme/host/fc.c

+++ b/drivers/nvme/host/fc.c

@@ -2731,6 +2731,7 @@ nvme_fc_init_ctrl(struct device *dev, st

 	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)) {

--- a/drivers/nvme/host/nvme.h

+++ b/drivers/nvme/host/nvme.h

@@ -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 */

--- a/drivers/nvme/host/pci.c

+++ b/drivers/nvme/host/pci.c

@@ -1377,6 +1377,7 @@ static int nvme_alloc_admin_tags(struct

 		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)) {

--- a/drivers/nvme/host/rdma.c

+++ b/drivers/nvme/host/rdma.c

@@ -698,6 +698,7 @@ static int nvme_rdma_configure_admin_que

 	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)) {

--- a/drivers/nvme/target/loop.c

+++ b/drivers/nvme/target/loop.c

@@ -375,6 +375,7 @@ static int nvme_loop_configure_admin_que

 	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)) {