Merge pull request #6893 from janjust/osc_error_path_fix

artpol84 · web-flow · commit d58c59eb71e4 · 2019-08-12T21:23:57.000-07:00
osc/ucx: Fix error path
diff --git a/ompi/mca/osc/ucx/osc_ucx_component.c b/ompi/mca/osc/ucx/osc_ucx_component.c
@@ -356,7 +356,7 @@ static int component_select(struct ompi_win_t *win, void **base, size_t size, in
         ret = opal_progress_register(progress_callback);
         if (OMPI_SUCCESS != ret) {
             OSC_UCX_VERBOSE(1, "opal_progress_register failed: %d", ret);
-            goto error;
+            goto select_unlock;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,7 @@ static int component_select(struct ompi_win_t win, void *base, size_t size, in`
`356`	`356`	`ret = opal_progress_register(progress_callback);`
`357`	`357`	`if (OMPI_SUCCESS != ret) {`
`358`	`358`	`OSC_UCX_VERBOSE(1, "opal_progress_register failed: %d", ret);`
`359`		`- goto error;`
	`359`	`+ goto select_unlock;`
`360`	`360`	`}`
`361`	`361`	`}`
`362`	`362`