nvme-rdma: rename nvme_rdma_init_queue to nvme_rdma_alloc_queue

Give it a name symmetric to nvme_rdma_free_queue. Also pass in the ctrl
sqsize+1 and not the opts queue_size.  And suppress a superflous
failure message.

Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 34d3ed8..d87874e 100644 (file)
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -504,7 +504,7 @@ out_put_dev:
        return ret;
 }
 
-static int nvme_rdma_init_queue(struct nvme_rdma_ctrl *ctrl,
+static int nvme_rdma_alloc_queue(struct nvme_rdma_ctrl *ctrl,
                int idx, size_t queue_size)
 {
        struct nvme_rdma_queue *queue;
@@ -615,7 +615,7 @@ out_stop_queues:
        return ret;
 }
 
-static int nvme_rdma_init_io_queues(struct nvme_rdma_ctrl *ctrl)
+static int nvme_rdma_alloc_io_queues(struct nvme_rdma_ctrl *ctrl)
 {
        struct nvmf_ctrl_options *opts = ctrl->ctrl.opts;
        unsigned int nr_io_queues;
@@ -634,13 +634,10 @@ static int nvme_rdma_init_io_queues(struct nvme_rdma_ctrl *ctrl)
                "creating %d I/O queues.\n", nr_io_queues);
 
        for (i = 1; i < ctrl->ctrl.queue_count; i++) {
-               ret = nvme_rdma_init_queue(ctrl, i,
-                                          ctrl->ctrl.opts->queue_size);
-               if (ret) {
-                       dev_info(ctrl->ctrl.device,
-                               "failed to initialize i/o queue: %d\n", ret);
+               ret = nvme_rdma_alloc_queue(ctrl, i,
+                               ctrl->ctrl.sqsize + 1);
+               if (ret)
                        goto out_free_queues;
-               }
        }
 
        return 0;
@@ -736,7 +733,7 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl,
 {
        int error;
 
-       error = nvme_rdma_init_queue(ctrl, 0, NVME_AQ_DEPTH);
+       error = nvme_rdma_alloc_queue(ctrl, 0, NVME_AQ_DEPTH);
        if (error)
                return error;
 
@@ -824,7 +821,7 @@ static int nvme_rdma_configure_io_queues(struct nvme_rdma_ctrl *ctrl, bool new)
 {
        int ret;
 
-       ret = nvme_rdma_init_io_queues(ctrl);
+       ret = nvme_rdma_alloc_io_queues(ctrl);
        if (ret)
                return ret;