Commit 72e8b5cd authored by Chaitanya Kulkarni's avatar Chaitanya Kulkarni Committed by Christoph Hellwig
Browse files

nvme: add a helper to initialize connect_q 



Add and use helper to remove duplicate code for fabrics connect_q
initialization and error handling for all the transports.

Signed-off-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 4686af88

drivers/nvme/host/fc.c

+2 −4
Original line number Diff line number Diff line
@@ -2916,11 +2916,9 @@ nvme_fc_create_io_queues(struct nvme_fc_ctrl *ctrl) 


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



	ctrl->ctrl.connect_q = blk_mq_init_queue(&ctrl->tag_set);

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

		ret = PTR_ERR(ctrl->ctrl.connect_q);

	ret = nvme_ctrl_init_connect_q(&(ctrl->ctrl));

	if (ret)

		goto out_free_tag_set;

	}



	ret = nvme_fc_create_hw_io_queues(ctrl, ctrl->ctrl.sqsize + 1);

	if (ret)

drivers/nvme/host/nvme.h

+8 −0
Original line number Diff line number Diff line
@@ -894,6 +894,14 @@ static inline int nvme_update_zone_info(struct nvme_ns *ns, unsigned lbaf) 
}

#endif



static inline int nvme_ctrl_init_connect_q(struct nvme_ctrl *ctrl)

{

	ctrl->connect_q = blk_mq_init_queue(ctrl->tagset);

	if (IS_ERR(ctrl->connect_q))

		return PTR_ERR(ctrl->connect_q);

	return 0;

}



static inline struct nvme_ns *nvme_get_ns_from_dev(struct device *dev)

{

	return dev_to_disk(dev)->private_data;

drivers/nvme/host/rdma.c

+2 −4
Original line number Diff line number Diff line
@@ -978,12 +978,10 @@ static int nvme_rdma_configure_io_queues(struct nvme_rdma_ctrl *ctrl, bool new) 
			goto out_free_io_queues;

		}



		ctrl->ctrl.connect_q = blk_mq_init_queue(&ctrl->tag_set);

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

			ret = PTR_ERR(ctrl->ctrl.connect_q);

		ret = nvme_ctrl_init_connect_q(&(ctrl->ctrl));

		if (ret)

			goto out_free_tag_set;

	}

	}



	ret = nvme_rdma_start_io_queues(ctrl);

	if (ret)

drivers/nvme/host/tcp.c

+2 −4
Original line number Diff line number Diff line
@@ -1825,12 +1825,10 @@ static int nvme_tcp_configure_io_queues(struct nvme_ctrl *ctrl, bool new) 
			goto out_free_io_queues;

		}



		ctrl->connect_q = blk_mq_init_queue(ctrl->tagset);

		if (IS_ERR(ctrl->connect_q)) {

			ret = PTR_ERR(ctrl->connect_q);

		ret = nvme_ctrl_init_connect_q(ctrl);

		if (ret)

			goto out_free_tag_set;

	}

	}



	ret = nvme_tcp_start_io_queues(ctrl);

	if (ret)

drivers/nvme/target/loop.c

+2 −4
Original line number Diff line number Diff line
@@ -543,11 +543,9 @@ static int nvme_loop_create_io_queues(struct nvme_loop_ctrl *ctrl) 
	if (ret)

		goto out_destroy_queues;



	ctrl->ctrl.connect_q = blk_mq_init_queue(&ctrl->tag_set);

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

		ret = PTR_ERR(ctrl->ctrl.connect_q);

	ret = nvme_ctrl_init_connect_q(&(ctrl->ctrl));

	if (ret)

		goto out_free_tagset;

	}



	ret = nvme_loop_connect_io_queues(ctrl);

	if (ret)