Skip to content

Commit 532cd9e

Browse files
committed
osc/rdma: Don't double lock in ompi_osc_rdma_refresh_dynamic_region().
Prior to entering this, it already grabs an exclusive lock. Trying to acquire a shared lock here will hang. Signed-off-by: Austen Lauria <[email protected]>
1 parent 95b1039 commit 532cd9e

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

ompi/mca/osc/rdma/osc_rdma_dynamic.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -428,10 +428,6 @@ static int ompi_osc_rdma_refresh_dynamic_region (ompi_osc_rdma_module_t *module,
428428
}
429429
peer->regions = temp;
430430

431-
/* lock the region */
432-
ompi_osc_rdma_lock_acquire_shared (module, &peer->super, 1, offsetof (ompi_osc_rdma_state_t, regions_lock),
433-
OMPI_OSC_RDMA_LOCK_EXCLUSIVE);
434-
435431
source_address = (uint64_t)(intptr_t) peer->super.state + offsetof (ompi_osc_rdma_state_t, regions);
436432
ret = ompi_osc_get_data_blocking (module, peer->super.state_btl_index, peer->super.state_endpoint,
437433
source_address, peer->super.state_handle, peer->regions, region_len);
@@ -440,9 +436,6 @@ static int ompi_osc_rdma_refresh_dynamic_region (ompi_osc_rdma_module_t *module,
440436
return ret;
441437
}
442438

443-
/* release the region lock */
444-
ompi_osc_rdma_lock_release_shared (module, &peer->super, -1, offsetof (ompi_osc_rdma_state_t, regions_lock));
445-
446439
/* update cached region ids */
447440
peer->region_id = region_id;
448441
peer->region_count = region_count;

0 commit comments

Comments
 (0)