From 456b73da696ab69e88d36f6a72391b41b81c2792 Mon Sep 17 00:00:00 2001
From: Gilles Gouaillardet <gilles@rist.or.jp>
Date: Fri, 13 May 2016 09:03:48 +0900
Subject: [PATCH] btl/openib: fix error path in init_one_device()
do not explicitly release ib verbs components since they will
be released in the object destructor
Thanks Durga for the report
---
opal/mca/btl/openib/btl_openib_component.c | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/opal/mca/btl/openib/btl_openib_component.c b/opal/mca/btl/openib/btl_openib_component.c
index 829a77dbff..25b918b00a 100644
--- a/opal/mca/btl/openib/btl_openib_component.c
+++ b/opal/mca/btl/openib/btl_openib_component.c
@@ -2229,16 +2229,6 @@ static int init_one_device(opal_list_t *btl_list, struct ibv_device* ib_dev)
}
error:
-#if OPAL_ENABLE_PROGRESS_THREADS
- if (device->ib_channel) {
- ibv_destroy_comp_channel(device->ib_channel);
- }
-#endif
-
- if (device->ib_pd) {
- ibv_dealloc_pd(device->ib_pd);
- }
-
if (OPAL_SUCCESS != ret) {
opal_show_help("help-mpi-btl-openib.txt",
"error in device init", true,
@@ -2246,9 +2236,6 @@ error:
ibv_get_device_name(device->ib_dev));
}
- if (device->ib_dev_context) {
- ibv_close_device(device->ib_dev_context);
- }
if (NULL != allowed_ports) {
free(allowed_ports);
}