RDMA/{cma, ucma}: Simplify and rename rdma_set_ib_paths

Since 2006 there has been no user of rdmacm based application to make use
of setting multiple path records using rdma_set_ib_paths API.

Therefore code is simplified to allow setting one path record entry.
Now that it sets only single path, it is renamed to reflect the same.

Signed-off-by: Parav Pandit <parav@mellanox.com>
Reviewed-by: Mark Bloch <markb@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 5bcbb5c5ea1ccbecb85453954256cf8ce4d0d3bb..5c158cda08e31d5d474608cf56f5d64bf04e046c 100644 (file)
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -2517,8 +2517,8 @@ cma_iboe_set_path_rec_l2_fields(struct rdma_id_private *id_priv)
        return ndev;
 }
 
-int rdma_set_ib_paths(struct rdma_cm_id *id,
-                     struct sa_path_rec *path_rec, int num_paths)
+int rdma_set_ib_path(struct rdma_cm_id *id,
+                    struct sa_path_rec *path_rec)
 {
        struct rdma_id_private *id_priv;
        int ret;
@@ -2528,20 +2528,20 @@ int rdma_set_ib_paths(struct rdma_cm_id *id,
                           RDMA_CM_ROUTE_RESOLVED))
                return -EINVAL;
 
-       id->route.path_rec = kmemdup(path_rec, sizeof *path_rec * num_paths,
+       id->route.path_rec = kmemdup(path_rec, sizeof(*path_rec),
                                     GFP_KERNEL);
        if (!id->route.path_rec) {
                ret = -ENOMEM;
                goto err;
        }
 
-       id->route.num_paths = num_paths;
+       id->route.num_paths = 1;
        return 0;
 err:
        cma_comp_exch(id_priv, RDMA_CM_ROUTE_RESOLVED, RDMA_CM_ADDR_RESOLVED);
        return ret;
 }
-EXPORT_SYMBOL(rdma_set_ib_paths);
+EXPORT_SYMBOL(rdma_set_ib_path);
 
 static int cma_resolve_iw_route(struct rdma_id_private *id_priv, int timeout_ms)
 {

diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index eb85b546e223c7fe30a52198d34a8601bfd49629..6d32af27bac69ebbd5226ea486fad217d27f6867 100644 (file)
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -1231,9 +1231,9 @@ static int ucma_set_ib_path(struct ucma_context *ctx,
                struct sa_path_rec opa;
 
                sa_convert_path_ib_to_opa(&opa, &sa_path);
-               ret = rdma_set_ib_paths(ctx->cm_id, &opa, 1);
+               ret = rdma_set_ib_path(ctx->cm_id, &opa);
        } else {
-               ret = rdma_set_ib_paths(ctx->cm_id, &sa_path, 1);
+               ret = rdma_set_ib_path(ctx->cm_id, &sa_path);
        }
        if (ret)
                return ret;

diff --git a/include/rdma/rdma_cm_ib.h b/include/rdma/rdma_cm_ib.h
index 6947a6ba25579f06c5de1357c6d0a094cbb58d41..6a69d71a21a51cd41e06f9cd2fe013340c1d4b98 100644 (file)
--- a/include/rdma/rdma_cm_ib.h
+++ b/include/rdma/rdma_cm_ib.h
@@ -36,17 +36,17 @@
 #include <rdma/rdma_cm.h>
 
 /**
- * rdma_set_ib_paths - Manually sets the path records used to establish a
+ * rdma_set_ib_path - Manually sets the path record used to establish a
  *   connection.
  * @id: Connection identifier associated with the request.
  * @path_rec: Reference to the path record
  *
  * This call permits a user to specify routing information for rdma_cm_id's
- * bound to Infiniband devices.  It is called on the client side of a
+ * bound to InfiniBand devices. It is called on the client side of a
  * connection and replaces the call to rdma_resolve_route.
  */
-int rdma_set_ib_paths(struct rdma_cm_id *id,
-                     struct sa_path_rec *path_rec, int num_paths);
+int rdma_set_ib_path(struct rdma_cm_id *id,
+                    struct sa_path_rec *path_rec);
 
 /* Global qkey for UDP QPs and multicast groups. */
 #define RDMA_UDP_QKEY 0x01234567