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