|
|
fa196d |
From ea4c14b07e9856cdbb70fc09771ae9373d39391c Mon Sep 17 00:00:00 2001
|
|
|
fa196d |
From: Xiao Yang <yangx.jy@cn.fujitsu.com>
|
|
|
fa196d |
Date: Wed, 16 Dec 2020 17:22:52 +0800
|
|
|
fa196d |
Subject: [PATCH] librdmacm: Don't overwrite errno returned from libibverbs
|
|
|
fa196d |
|
|
|
fa196d |
[ Upstream commit 11bf28021e62235f312e3132013e3736e4e835e0 ]
|
|
|
fa196d |
|
|
|
fa196d |
Some functions reports fixed ENOMEM when getting any failure, so
|
|
|
fa196d |
it's hard for user to know which actual error happens on them.
|
|
|
fa196d |
|
|
|
fa196d |
Fixes: 663098bfc3ac ("Rename librdmacm")
|
|
|
fa196d |
Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
|
|
|
fa196d |
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
|
|
|
fa196d |
Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
|
|
|
fa196d |
---
|
|
|
fa196d |
librdmacm/cma.c | 6 +++---
|
|
|
fa196d |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
fa196d |
|
|
|
fa196d |
diff --git a/librdmacm/cma.c b/librdmacm/cma.c
|
|
|
fa196d |
index 6e3956558471..2e7d019a3f7f 100644
|
|
|
fa196d |
--- a/librdmacm/cma.c
|
|
|
fa196d |
+++ b/librdmacm/cma.c
|
|
|
fa196d |
@@ -635,7 +635,7 @@ static int ucma_get_device(struct cma_id_private *id_priv, __be64 guid,
|
|
|
fa196d |
if (!cma_dev->pd)
|
|
|
fa196d |
cma_dev->pd = ibv_alloc_pd(cma_dev->verbs);
|
|
|
fa196d |
if (!cma_dev->pd) {
|
|
|
fa196d |
- ret = ERR(ENOMEM);
|
|
|
fa196d |
+ ret = -1;
|
|
|
fa196d |
goto out;
|
|
|
fa196d |
}
|
|
|
fa196d |
|
|
|
fa196d |
@@ -1490,7 +1490,7 @@ static int ucma_create_cqs(struct rdma_cm_id *id, uint32_t send_size, uint32_t r
|
|
|
fa196d |
return 0;
|
|
|
fa196d |
err:
|
|
|
fa196d |
ucma_destroy_cqs(id);
|
|
|
fa196d |
- return ERR(ENOMEM);
|
|
|
fa196d |
+ return -1;
|
|
|
fa196d |
}
|
|
|
fa196d |
|
|
|
fa196d |
int rdma_create_srq_ex(struct rdma_cm_id *id, struct ibv_srq_init_attr_ex *attr)
|
|
|
fa196d |
@@ -1662,7 +1662,7 @@ int rdma_create_qp_ex(struct rdma_cm_id *id,
|
|
|
fa196d |
attr->srq = id->srq;
|
|
|
fa196d |
qp = ibv_create_qp_ex(id->verbs, attr);
|
|
|
fa196d |
if (!qp) {
|
|
|
fa196d |
- ret = ERR(ENOMEM);
|
|
|
fa196d |
+ ret = -1;
|
|
|
fa196d |
goto err1;
|
|
|
fa196d |
}
|
|
|
fa196d |
|
|
|
fa196d |
--
|
|
|
fa196d |
2.25.4
|
|
|
fa196d |
|