From: Leon Romanovsky <leonro@xxxxxxxxxxxx>
Separate addition of restrack entry to user/kernel/general routines to
allow use of general rdma_restrack_add() by drivers.
Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxxxx>
---
drivers/infiniband/core/restrack.c | 27 ++++++++++-----------------
1 file changed, 10 insertions(+), 17 deletions(-)
diff --git a/drivers/infiniband/core/restrack.c b/drivers/infiniband/core/restrack.c
index dc05a659bc01..c9a0daf46499 100644
--- a/drivers/infiniband/core/restrack.c
+++ b/drivers/infiniband/core/restrack.c
@@ -267,29 +267,13 @@ static void rdma_restrack_add(struct rdma_restrack_entry *res)
{
struct ib_device *dev = res_to_dev(res);
struct xarray *xa = rdma_dev_to_xa(dev, res->type);
- unsigned long id;
int ret;
- if (!dev)
- return;
-
- if (res->type != RDMA_RESTRACK_CM_ID || rdma_is_kernel_res(res))
- res->task = NULL;
-
- if (!rdma_is_kernel_res(res)) {
- if (!res->task)
- rdma_restrack_set_task(res, NULL);
- res->kern_name = NULL;
- } else {
- set_kern_name(res);
- }
-
kref_init(&res->kref);
init_completion(&res->comp);
res->valid = true;
- id = res_to_id(res);
- ret = xa_insert(xa, id, res, GFP_KERNEL);
+ ret = xa_insert(xa, res_to_id(res), res, GFP_KERNEL);
WARN_ONCE(ret == -EEXIST, "Tried to add non-unique type %d entry\n",
res->type);
if (ret)
@@ -302,6 +286,8 @@ static void rdma_restrack_add(struct rdma_restrack_entry *res)
*/
void rdma_restrack_kadd(struct rdma_restrack_entry *res)
{
+ res->task = NULL;
+ set_kern_name(res);
res->user = false;
rdma_restrack_add(res);
}
@@ -313,6 +299,13 @@ EXPORT_SYMBOL(rdma_restrack_kadd);
*/
void rdma_restrack_uadd(struct rdma_restrack_entry *res)
{
+ if (res->type != RDMA_RESTRACK_CM_ID)
+ res->task = NULL;
+
+ if (!res->task)
+ rdma_restrack_set_task(res, NULL);
+ res->kern_name = NULL;
+
res->user = true;
rdma_restrack_add(res);
}
--
2.19.1
