diff options
| author | Jason Dillaman <dillaman@redhat.com> | 2019-04-19 22:52:23 +0200 |
|---|---|---|
| committer | Jason Dillaman <dillaman@redhat.com> | 2019-04-28 15:15:14 +0200 |
| commit | 236ffa31812ceadfdcb8926785f305163a153f3b (patch) | |
| tree | 1e1ddb784fceb287f7670267d8a6b45efce94eac /src/test/librbd/test_mock_ObjectMap.cc | |
| parent | Merge pull request #27766 from majianpeng/msg-noneed-set-connection (diff) | |
| download | ceph-236ffa31812ceadfdcb8926785f305163a153f3b.tar.xz ceph-236ffa31812ceadfdcb8926785f305163a153f3b.zip | |
librbd: renamed 'ImageCtx::snap_lock' to 'image_lock'
This is the first step in consolidating multiple locks under a single
reader/writer lock for simplicity.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Diffstat (limited to 'src/test/librbd/test_mock_ObjectMap.cc')
| -rw-r--r-- | src/test/librbd/test_mock_ObjectMap.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/librbd/test_mock_ObjectMap.cc b/src/test/librbd/test_mock_ObjectMap.cc index 41672c73f33..98c91173492 100644 --- a/src/test/librbd/test_mock_ObjectMap.cc +++ b/src/test/librbd/test_mock_ObjectMap.cc @@ -180,7 +180,7 @@ TEST_F(TestMockObjectMap, NonDetainedUpdate) { C_SaferCond update_ctx1; C_SaferCond update_ctx2; { - RWLock::RLocker snap_locker(mock_image_ctx.snap_lock); + RWLock::RLocker image_locker(mock_image_ctx.image_lock); RWLock::WLocker object_map_locker(mock_image_ctx.object_map_lock); mock_object_map.aio_update(CEPH_NOSNAP, 0, 1, {}, {}, false, &update_ctx1); mock_object_map.aio_update(CEPH_NOSNAP, 1, 1, {}, {}, false, &update_ctx2); @@ -238,7 +238,7 @@ TEST_F(TestMockObjectMap, DetainedUpdate) { C_SaferCond update_ctx3; C_SaferCond update_ctx4; { - RWLock::RLocker snap_locker(mock_image_ctx.snap_lock); + RWLock::RLocker image_locker(mock_image_ctx.image_lock); RWLock::WLocker object_map_locker(mock_image_ctx.object_map_lock); mock_object_map.aio_update(CEPH_NOSNAP, 1, 4, 1, {}, {}, false, &update_ctx1); |