btl/openib: have add_proc() return immediately when the port is disabled.

ggouaillardet · ggouaillardet · commit 53f9c3df1d42 · 2018-12-12T15:57:04.000+09:00
Fixes an issue introduced in open-mpi/ompi@0a2ce58 Refs. open-mpi#6137 Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
diff --git a/opal/mca/btl/openib/btl_openib.c b/opal/mca/btl/openib/btl_openib.c
@@ -1048,6 +1048,7 @@ int mca_btl_openib_add_procs(
         opal_show_help("help-mpi-btl-openib.txt", "ib port not selected",
                        true, opal_process_info.nodename,
                        ibv_get_device_name(openib_btl->device->ib_dev), openib_btl->port_num);
+        return OPAL_SUCCESS;
     }
 
     btl_rank = get_openib_btl_params(openib_btl, &lcl_subnet_id_port_cnt);
diff --git a/opal/mca/btl/openib/btl_openib_proc.c b/opal/mca/btl/openib/btl_openib_proc.c
@@ -277,7 +277,6 @@ mca_btl_openib_proc_t* mca_btl_openib_proc_get_locked(opal_proc_t* proc)
 
     if (0 == ib_proc->proc_port_count) {
         ib_proc->proc_endpoints = NULL;
-        goto no_err_exit;
     } else {
         ib_proc->proc_endpoints = (volatile mca_btl_base_endpoint_t**)
             malloc(ib_proc->proc_port_count *

Original file line number	Diff line number	Diff line change
`@@ -1048,6 +1048,7 @@ int mca_btl_openib_add_procs(`
`1048`	`1048`	`opal_show_help("help-mpi-btl-openib.txt", "ib port not selected",`
`1049`	`1049`	`true, opal_process_info.nodename,`
`1050`	`1050`	`ibv_get_device_name(openib_btl->device->ib_dev), openib_btl->port_num);`
	`1051`	`+ return OPAL_SUCCESS;`
`1051`	`1052`	`}`
`1052`	`1053`
`1053`	`1054`	`btl_rank = get_openib_btl_params(openib_btl, &lcl_subnet_id_port_cnt);`