Skip to content

Commit 8a89d47

Browse files
committed
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 (back-ported from commit open-mpi/ompi@456b73d)
1 parent 5f17e38 commit 8a89d47

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

opal/mca/btl/openib/btl_openib_component.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2184,29 +2184,13 @@ static int init_one_device(opal_list_t *btl_list, struct ibv_device* ib_dev)
21842184
}
21852185

21862186
error:
2187-
#if OPAL_ENABLE_PROGRESS_THREADS
2188-
if (device->ib_channel) {
2189-
ibv_destroy_comp_channel(device->ib_channel);
2190-
}
2191-
#endif
2192-
if (device->mpool) {
2193-
mca_mpool_base_module_destroy(device->mpool);
2194-
}
2195-
2196-
if (device->ib_pd) {
2197-
ibv_dealloc_pd(device->ib_pd);
2198-
}
2199-
22002187
if (OPAL_SUCCESS != ret) {
22012188
opal_show_help("help-mpi-btl-openib.txt",
22022189
"error in device init", true,
22032190
opal_process_info.nodename,
22042191
ibv_get_device_name(device->ib_dev));
22052192
}
22062193

2207-
if (device->ib_dev_context) {
2208-
ibv_close_device(device->ib_dev_context);
2209-
}
22102194
if (NULL != allowed_ports) {
22112195
free(allowed_ports);
22122196
}

0 commit comments

Comments
 (0)