Commit 10fd7fb6 authored by Keith Busch's avatar Keith Busch
Browse files

nvme: tcp: split controller bringup handling 



Drivers must call nvme_uninit_ctrl after a successful nvme_init_ctrl.
Split the allocation side out to make the error handling boundary easier
to navigate. The nvme tcp driver's error handling had different returns
in the error goto label's, which harm readability.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent b9ecbfa4

drivers/nvme/host/tcp.c

+19 −6
Original line number Diff line number Diff line
@@ -2686,7 +2686,7 @@ nvme_tcp_existing_controller(struct nvmf_ctrl_options *opts) 
	return found;

}



static struct nvme_ctrl *nvme_tcp_create_ctrl(struct device *dev,

static struct nvme_tcp_ctrl *nvme_tcp_alloc_ctrl(struct device *dev,

		struct nvmf_ctrl_options *opts)

{

	struct nvme_tcp_ctrl *ctrl;
@@ -2761,6 +2761,24 @@ static struct nvme_ctrl *nvme_tcp_create_ctrl(struct device *dev, 
	if (ret)

		goto out_kfree_queues;



	return ctrl;

out_kfree_queues:

	kfree(ctrl->queues);

out_free_ctrl:

	kfree(ctrl);

	return ERR_PTR(ret);

}



static struct nvme_ctrl *nvme_tcp_create_ctrl(struct device *dev,

		struct nvmf_ctrl_options *opts)

{

	struct nvme_tcp_ctrl *ctrl;

	int ret;



	ctrl = nvme_tcp_alloc_ctrl(dev, opts);

	if (IS_ERR(ctrl))

		return ERR_CAST(ctrl);



	if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_CONNECTING)) {

		WARN_ON_ONCE(1);

		ret = -EINTR;
@@ -2786,11 +2804,6 @@ static struct nvme_ctrl *nvme_tcp_create_ctrl(struct device *dev, 
	if (ret > 0)

		ret = -EIO;

	return ERR_PTR(ret);

out_kfree_queues:

	kfree(ctrl->queues);

out_free_ctrl:

	kfree(ctrl);

	return ERR_PTR(ret);

}



static struct nvmf_transport_ops nvme_tcp_transport = {