Merge pull request #3315 from hjelmn/v3.x_osc_rdma

hppritcha · web-flow · commit 07948231ea0a · 2017-04-11T07:53:54.000-06:00
osc/rdma: fix typo in atomic code
diff --git a/ompi/mca/osc/rdma/osc_rdma_lock.h b/ompi/mca/osc/rdma/osc_rdma_lock.h
@@ -68,7 +68,7 @@ static inline int ompi_osc_rdma_lock_btl_fop (ompi_osc_rdma_module_t *module, om
     }
 
     if (NULL != frag) {
-        if (*result) {
+        if (result) {
             *result = *temp;
         }
         ompi_osc_rdma_frag_complete (frag);

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ static inline int ompi_osc_rdma_lock_btl_fop (ompi_osc_rdma_module_t *module, om`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`if (NULL != frag) {`
`71`		`- if (*result) {`
	`71`	`+ if (result) {`
`72`	`72`	`result = temp;`
`73`	`73`	`}`
`74`	`74`	`ompi_osc_rdma_frag_complete (frag);`