Skip to content

Commit c58c774

Browse files
committed
btl/openib: have add_proc() return immediately when the port is disabled.
Fixes an issue introduced in 0a2ce58 This is a one-off commit for the v4.0.x branch since btl/openib has been removed from master. Refs. #6137 Signed-off-by: Gilles Gouaillardet <[email protected]>
1 parent d7053a3 commit c58c774

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

opal/mca/btl/openib/btl_openib.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,6 +1046,7 @@ int mca_btl_openib_add_procs(
10461046
opal_show_help("help-mpi-btl-openib.txt", "ib port not selected",
10471047
true, opal_process_info.nodename,
10481048
ibv_get_device_name(openib_btl->device->ib_dev), openib_btl->port_num);
1049+
return OPAL_SUCCESS;
10491050
}
10501051

10511052
btl_rank = get_openib_btl_params(openib_btl, &lcl_subnet_id_port_cnt);

opal/mca/btl/openib/btl_openib_proc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,6 @@ mca_btl_openib_proc_t* mca_btl_openib_proc_get_locked(opal_proc_t* proc)
277277

278278
if (0 == ib_proc->proc_port_count) {
279279
ib_proc->proc_endpoints = NULL;
280-
goto no_err_exit;
281280
} else {
282281
ib_proc->proc_endpoints = (volatile mca_btl_base_endpoint_t**)
283282
malloc(ib_proc->proc_port_count *

0 commit comments

Comments
 (0)