Signed-off-by: Sagi Grimberg <s...@grimberg.me>
---
drivers/nvme/host/rdma.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 34518c90609a..d9524389aedd 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -565,7 +565,7 @@ static void nvme_rdma_stop_queue(struct nvme_rdma_ctrl
*ctrl, int qid)
{
struct nvme_rdma_queue *queue = &ctrl->queues[qid];
- if (test_bit(NVME_RDMA_Q_DELETING, &queue->flags))
+ if (!test_and_clear_bit(NVME_RDMA_Q_LIVE, &queue->flags))
return;
rdma_disconnect(queue->cm_id);
ib_drain_qp(queue->qp);
@@ -617,7 +617,9 @@ static int nvme_rdma_start_queue(struct nvme_rdma_ctrl
*ctrl, int idx)
else
ret = nvmf_connect_admin_queue(&ctrl->ctrl);
- if (ret)
+ if (!ret)
+ set_bit(NVME_RDMA_Q_LIVE, &ctrl->queues[idx].flags);
+ else
dev_info(ctrl->ctrl.device,
"failed to connect queue: %d ret=%d\n", idx, ret);
return ret;
@@ -631,8 +633,6 @@ static int nvme_rdma_start_io_queues(struct nvme_rdma_ctrl
*ctrl)
ret = nvme_rdma_start_queue(ctrl, i);
if (ret)
goto out_stop_queues;
-
- set_bit(NVME_RDMA_Q_LIVE, &ctrl->queues[i].flags);
}
return 0;
@@ -823,8 +823,6 @@ static int nvme_rdma_configure_admin_queue(struct
nvme_rdma_ctrl *ctrl, bool new
if (error)
goto out_cleanup_connect_queue;
- set_bit(NVME_RDMA_Q_LIVE, &ctrl->queues[0].flags);
-
error = nvmf_reg_read64(&ctrl->ctrl, NVME_REG_CAP, &ctrl->ctrl.cap);
if (error) {
dev_err(ctrl->ctrl.device,
--
2.7.4
