Merge pull request #10058 from bwbarrett/bugfix/osc-rdma-priority

bwbarrett · web-flow · commit 20056550df88 · 2022-03-01T10:58:11.000-08:00
osc/rdma: Fix priority setting bug
diff --git a/ompi/mca/osc/rdma/osc_rdma_component.c b/ompi/mca/osc/rdma/osc_rdma_component.c
@@ -374,7 +374,6 @@ static int ompi_osc_rdma_component_query (struct ompi_win_t *win, void **base, s
                                           struct ompi_communicator_t *comm, struct opal_info_t *info,
                                           int flavor)
 {
-
     if (MPI_WIN_FLAVOR_SHARED == flavor) {
         return -1;
     }
@@ -395,7 +394,7 @@ static int ompi_osc_rdma_component_query (struct ompi_win_t *win, void **base, s
         return -1;
     }
 
-    return OMPI_SUCCESS;;
+    return mca_osc_rdma_component.priority;
 }
 
 static int ompi_osc_rdma_initialize_region (ompi_osc_rdma_module_t *module, void **base, size_t size) {

Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,6 @@ static int ompi_osc_rdma_component_query (struct ompi_win_t win, void *base, s`
`374`	`374`	`struct ompi_communicator_t comm, struct opal_info_t info,`
`375`	`375`	`int flavor)`
`376`	`376`	`{`
`377`		`-`
`378`	`377`	`if (MPI_WIN_FLAVOR_SHARED == flavor) {`
`379`	`378`	`return -1;`
`380`	`379`	`}`
`@@ -395,7 +394,7 @@ static int ompi_osc_rdma_component_query (struct ompi_win_t win, void *base, s`
`395`	`394`	`return -1;`
`396`	`395`	`}`
`397`	`396`
`398`		`- return OMPI_SUCCESS;;`
	`397`	`+ return mca_osc_rdma_component.priority;`
`399`	`398`	`}`
`400`	`399`
`401`	`400`	`static int ompi_osc_rdma_initialize_region (ompi_osc_rdma_module_t module, void *base, size_t size) {`