From cdfb50adf27854a2c353e6090094aaa05e565d8d Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 9 Apr 2014 16:07:53 -0700 Subject: [PATCH] Refresh of 0001-lazy-init.patch --- src/cma.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cma.c b/src/cma.c index b34472e4..12c8599f 100644 --- a/src/cma.c +++ b/src/cma.c @@ -256,7 +256,7 @@ static int ucma_dev_init(struct cma_device *cma_dev) if (ret) { fprintf(stderr, PFX "Fatal: unable to query RDMA device\n"); ret = ERR(ret); - goto err3; + goto err2; } cma_dev->port_cnt = attr.phys_port_cnt; @@ -267,7 +267,7 @@ static int ucma_dev_init(struct cma_device *cma_dev) pthread_mutex_unlock(&mut); return 0; -err1: +err2: ibv_close_device(cma_dev->verbs); cma_dev->verbs = NULL; err1: @@ -308,7 +308,7 @@ int ucma_init(void) goto err2; } - cma_dev_array = calloc(dev_cnt, sizeof *cma_dev); + cma_dev_array = calloc(dev_cnt, sizeof *cma_dev_array); if (!cma_dev_array) { ret = ERR(ENOMEM); goto err2; @@ -344,8 +344,8 @@ struct ibv_context **rdma_get_devices(int *num_devices) goto err1; for (i = 0; i < cma_dev_cnt; i++) { - ucma_dev_init(cma_dev_array[i]); - devs[i] = cma_dev_array[i].verbs + ucma_dev_init(&cma_dev_array[i]); + devs[i] = cma_dev_array[i].verbs; if (!devs[i]) goto err2; } -- 2.46.0