Commit 2ade8221 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme-loop: store the generic nvme_ctrl in set->driver_data 



Point the private data to the generic controller structure in preparation
of using the common tagset init/exit code.

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>
parent 379e0df5

drivers/nvme/target/loop.c

+5 −5
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ static int nvme_loop_init_request(struct blk_mq_tag_set *set, 
		struct request *req, unsigned int hctx_idx,

		unsigned int numa_node)

{

	struct nvme_loop_ctrl *ctrl = set->driver_data;

	struct nvme_loop_ctrl *ctrl = to_loop_ctrl(set->driver_data);

	struct nvme_loop_iod *iod = blk_mq_rq_to_pdu(req);



	nvme_req(req)->ctrl = &ctrl->ctrl;
@@ -218,7 +218,7 @@ static struct lock_class_key loop_hctx_fq_lock_key; 
static int nvme_loop_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,

		unsigned int hctx_idx)

{

	struct nvme_loop_ctrl *ctrl = data;

	struct nvme_loop_ctrl *ctrl = to_loop_ctrl(data);

	struct nvme_loop_queue *queue = &ctrl->queues[hctx_idx + 1];



	BUG_ON(hctx_idx >= ctrl->ctrl.queue_count);
@@ -238,7 +238,7 @@ static int nvme_loop_init_hctx(struct blk_mq_hw_ctx *hctx, void *data, 
static int nvme_loop_init_admin_hctx(struct blk_mq_hw_ctx *hctx, void *data,

		unsigned int hctx_idx)

{

	struct nvme_loop_ctrl *ctrl = data;

	struct nvme_loop_ctrl *ctrl = to_loop_ctrl(data);

	struct nvme_loop_queue *queue = &ctrl->queues[0];



	BUG_ON(hctx_idx != 0);
@@ -357,7 +357,7 @@ static int nvme_loop_configure_admin_queue(struct nvme_loop_ctrl *ctrl) 
	ctrl->admin_tag_set.numa_node = ctrl->ctrl.numa_node;

	ctrl->admin_tag_set.cmd_size = sizeof(struct nvme_loop_iod) +

		NVME_INLINE_SG_CNT * sizeof(struct scatterlist);

	ctrl->admin_tag_set.driver_data = ctrl;

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

	ctrl->admin_tag_set.nr_hw_queues = 1;

	ctrl->admin_tag_set.timeout = NVME_ADMIN_TIMEOUT;

	ctrl->admin_tag_set.flags = BLK_MQ_F_NO_SCHED;
@@ -530,7 +530,7 @@ static int nvme_loop_create_io_queues(struct nvme_loop_ctrl *ctrl) 
	ctrl->tag_set.flags = BLK_MQ_F_SHOULD_MERGE;

	ctrl->tag_set.cmd_size = sizeof(struct nvme_loop_iod) +

		NVME_INLINE_SG_CNT * sizeof(struct scatterlist);

	ctrl->tag_set.driver_data = ctrl;

	ctrl->tag_set.driver_data = &ctrl->ctrl;

	ctrl->tag_set.nr_hw_queues = ctrl->ctrl.queue_count - 1;

	ctrl->tag_set.timeout = NVME_IO_TIMEOUT;

	ctrl->ctrl.tagset = &ctrl->tag_set;