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

Commit 0350815a authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme-pci: 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 62b83b18

drivers/nvme/host/pci.c

+3 −15
Original line number Diff line number Diff line
@@ -348,19 +348,6 @@ static void nvme_admin_exit_hctx(struct blk_mq_hw_ctx *hctx, unsigned int hctx_i 
	nvmeq->tags = NULL;

}



static int nvme_admin_init_request(struct blk_mq_tag_set *set,

		struct request *req, unsigned int hctx_idx,

		unsigned int numa_node)

{

	struct nvme_dev *dev = set->driver_data;

	struct nvme_iod *iod = blk_mq_rq_to_pdu(req);

	struct nvme_queue *nvmeq = dev->queues[0];



	BUG_ON(!nvmeq);

	iod->nvmeq = nvmeq;

	return 0;

}



static int nvme_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,

			  unsigned int hctx_idx)

{
@@ -380,7 +367,8 @@ static int nvme_init_request(struct blk_mq_tag_set *set, struct request *req, 
{

	struct nvme_dev *dev = set->driver_data;

	struct nvme_iod *iod = blk_mq_rq_to_pdu(req);

	struct nvme_queue *nvmeq = dev->queues[hctx_idx + 1];

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

	struct nvme_queue *nvmeq = dev->queues[queue_idx];



	BUG_ON(!nvmeq);

	iod->nvmeq = nvmeq;
@@ -1288,7 +1276,7 @@ static const struct blk_mq_ops nvme_mq_admin_ops = { 
	.complete	= nvme_pci_complete_rq,

	.init_hctx	= nvme_admin_init_hctx,

	.exit_hctx      = nvme_admin_exit_hctx,

	.init_request	= nvme_admin_init_request,

	.init_request	= nvme_init_request,

	.timeout	= nvme_timeout,

};