Merge pull request #11304 from lrbison/rmda_cas_ne

wckzhang · web-flow · commit 57ca47ab0758 · 2023-01-13T11:32:30.000-08:00
OSC/RDMA: Fix Compare_and_swap return value when comp != target
diff --git a/ompi/mca/osc/rdma/osc_rdma_accumulate.c b/ompi/mca/osc/rdma/osc_rdma_accumulate.c
@@ -183,6 +183,8 @@ static inline int ompi_osc_rdma_cas_local (const void *source_addr, const void *
         if (ret) {
             goto out;
         }
+    } else {
+        ret = OMPI_SUCCESS;
     }
 
     ompi_osc_rdma_peer_accumulate_cleanup (module, peer, lock_acquired);

Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,8 @@ static inline int ompi_osc_rdma_cas_local (const void source_addr, const void `
`183`	`183`	`if (ret) {`
`184`	`184`	`goto out;`
`185`	`185`	`}`
	`186`	`+ } else {`
	`187`	`+ ret = OMPI_SUCCESS;`
`186`	`188`	`}`
`187`	`189`
`188`	`190`	`ompi_osc_rdma_peer_accumulate_cleanup (module, peer, lock_acquired);`