Skip to content

Commit 21864d1

Browse files
authored
Merge pull request #10473 from jotabf/patch-2
Removed deadlock in find dynamic region
2 parents ff7f86e + 9779b99 commit 21864d1

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

ompi/mca/osc/rdma/osc_rdma_dynamic.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -468,12 +468,9 @@ int ompi_osc_rdma_find_dynamic_region (ompi_osc_rdma_module_t *module, ompi_osc_
468468
" (len %lu)", base, base + len, (unsigned long) len);
469469

470470
OPAL_THREAD_LOCK(&module->lock);
471-
// Make sure region isn't being touched.
472-
ompi_osc_rdma_lock_acquire_exclusive (module, peer, offsetof (ompi_osc_rdma_state_t, regions_lock));
473471
if (!ompi_osc_rdma_peer_local_state (peer)) {
474472
ret = ompi_osc_rdma_refresh_dynamic_region (module, dy_peer);
475473
if (OMPI_SUCCESS != ret) {
476-
ompi_osc_rdma_lock_release_exclusive (module, peer, offsetof (ompi_osc_rdma_state_t, regions_lock));
477474
return ret;
478475
}
479476

@@ -490,7 +487,6 @@ int ompi_osc_rdma_find_dynamic_region (ompi_osc_rdma_module_t *module, ompi_osc_
490487
ret = OMPI_ERR_RMA_RANGE;
491488
}
492489
OPAL_THREAD_UNLOCK(&module->lock);
493-
ompi_osc_rdma_lock_release_exclusive (module, peer, offsetof (ompi_osc_rdma_state_t, regions_lock));
494490

495491
/* round a matching region */
496492
return ret;

0 commit comments

Comments
 (0)