Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76f983cb authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme-fc: merge init_request methods 



Now that we get the tagset passed we can have a single implementation for
the I/O and admin queues.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 385475ee

drivers/nvme/host/fc.c

+3 −13
Original line number Diff line number Diff line
@@ -1448,18 +1448,8 @@ nvme_fc_init_request(struct blk_mq_tag_set *set, struct request *rq, 
{

	struct nvme_fc_ctrl *ctrl = set->driver_data;

	struct nvme_fc_fcp_op *op = blk_mq_rq_to_pdu(rq);

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



	return __nvme_fc_init_request(ctrl, queue, op, rq, queue->rqcnt++);

}



static int

nvme_fc_init_admin_request(struct blk_mq_tag_set *set, struct request *rq,

		unsigned int hctx_idx, unsigned int numa_node)

{

	struct nvme_fc_ctrl *ctrl = set->driver_data;

	struct nvme_fc_fcp_op *op = blk_mq_rq_to_pdu(rq);

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

	int queue_idx = (set == &ctrl->tag_set) ? hctx_idx + 1 : 0;

	struct nvme_fc_queue *queue = &ctrl->queues[queue_idx];



	return __nvme_fc_init_request(ctrl, queue, op, rq, queue->rqcnt++);

}
@@ -2695,7 +2685,7 @@ nvme_fc_connect_ctrl_work(struct work_struct *work) 
static const struct blk_mq_ops nvme_fc_admin_mq_ops = {

	.queue_rq	= nvme_fc_queue_rq,

	.complete	= nvme_fc_complete_rq,

	.init_request	= nvme_fc_init_admin_request,

	.init_request	= nvme_fc_init_request,

	.exit_request	= nvme_fc_exit_request,

	.reinit_request	= nvme_fc_reinit_request,

	.init_hctx	= nvme_fc_init_admin_hctx,