Commit 370ae6e4 authored by Sagi Grimberg's avatar Sagi Grimberg
Browse files

nvme-rdma: cleanup error path in controller reset 



No need to queue an extra work to indirect controller removal, just call the
ctrl remove routine.

Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 68e16fcf

drivers/nvme/host/rdma.c

+9 −23
Original line number Diff line number Diff line
@@ -1732,13 +1732,10 @@ static void nvme_rdma_shutdown_ctrl(struct nvme_rdma_ctrl *ctrl, bool shutdown) 
	nvme_rdma_destroy_admin_queue(ctrl, shutdown);

}



static void __nvme_rdma_remove_ctrl(struct nvme_rdma_ctrl *ctrl, bool shutdown)

static void nvme_rdma_remove_ctrl(struct nvme_rdma_ctrl *ctrl)

{

	nvme_stop_ctrl(&ctrl->ctrl);

	nvme_remove_namespaces(&ctrl->ctrl);

	if (shutdown)

		nvme_rdma_shutdown_ctrl(ctrl, shutdown);



	nvme_rdma_shutdown_ctrl(ctrl, true);

	nvme_uninit_ctrl(&ctrl->ctrl);

	nvme_put_ctrl(&ctrl->ctrl);

}
@@ -1748,7 +1745,8 @@ static void nvme_rdma_del_ctrl_work(struct work_struct *work) 
	struct nvme_rdma_ctrl *ctrl = container_of(work,

				struct nvme_rdma_ctrl, delete_work);



	__nvme_rdma_remove_ctrl(ctrl, true);

	nvme_stop_ctrl(&ctrl->ctrl);

	nvme_rdma_remove_ctrl(ctrl);

}



static int __nvme_rdma_del_ctrl(struct nvme_rdma_ctrl *ctrl)
@@ -1780,14 +1778,6 @@ static int nvme_rdma_del_ctrl(struct nvme_ctrl *nctrl) 
	return ret;

}



static void nvme_rdma_remove_ctrl_work(struct work_struct *work)

{

	struct nvme_rdma_ctrl *ctrl = container_of(work,

				struct nvme_rdma_ctrl, delete_work);



	__nvme_rdma_remove_ctrl(ctrl, false);

}



static void nvme_rdma_reset_ctrl_work(struct work_struct *work)

{

	struct nvme_rdma_ctrl *ctrl =
@@ -1799,16 +1789,13 @@ static void nvme_rdma_reset_ctrl_work(struct work_struct *work) 
	nvme_rdma_shutdown_ctrl(ctrl, false);



	ret = nvme_rdma_configure_admin_queue(ctrl, false);

	if (ret) {

		/* ctrl is already shutdown, just remove the ctrl */

		INIT_WORK(&ctrl->delete_work, nvme_rdma_remove_ctrl_work);

		goto del_dead_ctrl;

	}

	if (ret)

		goto out_fail;



	if (ctrl->ctrl.queue_count > 1) {

		ret = nvme_rdma_configure_io_queues(ctrl, false);

		if (ret)

			goto del_dead_ctrl;

			goto out_fail;

	}



	changed = nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_LIVE);
@@ -1818,10 +1805,9 @@ static void nvme_rdma_reset_ctrl_work(struct work_struct *work) 


	return;



del_dead_ctrl:

	/* Deleting this dead controller... */

out_fail:

	dev_warn(ctrl->ctrl.device, "Removing after reset failure\n");

	WARN_ON(!queue_work(nvme_wq, &ctrl->delete_work));

	nvme_rdma_remove_ctrl(ctrl);

}



static const struct nvme_ctrl_ops nvme_rdma_ctrl_ops = {