OSC UCX: Remove stale free from merge conflict

devreal · devreal · commit 1314ef7668db · 2020-06-25T19:01:53.000+02:00
Signed-off-by: Joseph Schuchart &lt;schuchart@hlrs.de&gt;
diff --git a/ompi/mca/osc/ucx/osc_ucx_comm.c b/ompi/mca/osc/ucx/osc_ucx_comm.c
@@ -753,7 +753,6 @@ do_atomic_compare_and_swap(const void *origin_addr, const void *compare_addr,
     if (!module->acc_single_intrinsic) {
         ret = start_atomicity(module, target, &lock_acquired);
         if (ret != OMPI_SUCCESS) {
-            free(temp_addr);
             return ret;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -753,7 +753,6 @@ do_atomic_compare_and_swap(const void origin_addr, const void compare_addr,`
`753`	`753`	`if (!module->acc_single_intrinsic) {`
`754`	`754`	`ret = start_atomicity(module, target, &lock_acquired);`
`755`	`755`	`if (ret != OMPI_SUCCESS) {`
`756`		`- free(temp_addr);`
`757`	`756`	`return ret;`
`758`	`757`	`}`
`759`	`758`	`}`