[PATCH 1/3] nvme: rename NVME_CTRL_RECONNECTING state to NVME_CTRL_CONNECTING
Sagi Grimberg
sagi at grimberg.me
Thu Feb 8 07:28:11 PST 2018
> diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
> index 6c2fdfa..219c6a0 100644
> --- a/drivers/nvme/host/rdma.c
> +++ b/drivers/nvme/host/rdma.c
> @@ -887,7 +887,7 @@ static void nvme_rdma_free_ctrl(struct nvme_ctrl *nctrl)
> static void nvme_rdma_reconnect_or_remove(struct nvme_rdma_ctrl *ctrl)
> {
> /* If we are resetting/deleting then do nothing */
> - if (ctrl->ctrl.state != NVME_CTRL_RECONNECTING) {
> + if (ctrl->ctrl.state != NVME_CTRL_CONNECTING) {
> WARN_ON_ONCE(ctrl->ctrl.state == NVME_CTRL_NEW ||
> ctrl->ctrl.state == NVME_CTRL_LIVE);
> return;
> @@ -978,7 +978,7 @@ static void nvme_rdma_error_recovery_work(struct work_struct *work)
>
> static void nvme_rdma_error_recovery(struct nvme_rdma_ctrl *ctrl)
> {
> - if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_RECONNECTING))
> + if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_CONNECTING))
> return;
>
> queue_work(nvme_wq, &ctrl->err_work);
>
What is this based on? It does not apply on nvme-4.16.
More information about the Linux-nvme
mailing list