Commit 85032874 authored by Ruozhu Li's avatar Ruozhu Li Committed by Christoph Hellwig
Browse files

nvme-rdma: don't update queue count when failing to set io queues 



We update ctrl->queue_count and schedule another reconnect when io queue
count is zero.But we will never try to create any io queue in next reco-
nnection, because ctrl->queue_count already set to zero.We will end up
having an admin-only session in Live state, which is exactly what we try
to avoid in the original patch.
Update ctrl->queue_count after queue_count zero checking to fix it.

Signed-off-by: default avatarRuozhu Li <liruozhu@huawei.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 664227fd

drivers/nvme/host/rdma.c

+2 −2
Original line number Diff line number Diff line
@@ -735,13 +735,13 @@ static int nvme_rdma_alloc_io_queues(struct nvme_rdma_ctrl *ctrl) 
	if (ret)

		return ret;



	ctrl->ctrl.queue_count = nr_io_queues + 1;

	if (ctrl->ctrl.queue_count < 2) {

	if (nr_io_queues == 0) {

		dev_err(ctrl->ctrl.device,

			"unable to set any I/O queues\n");

		return -ENOMEM;

	}



	ctrl->ctrl.queue_count = nr_io_queues + 1;

	dev_info(ctrl->ctrl.device,

		"creating %d I/O queues.\n", nr_io_queues);