import 15.2.0 Octopus source

[ceph.git] / ceph / src / test / librbd / object_map / test_mock_InvalidateRequest.cc

diff --git a/ceph/src/test/librbd/object_map/test_mock_InvalidateRequest.cc b/ceph/src/test/librbd/object_map/test_mock_InvalidateRequest.cc
index f4b2ed43889a4edc1fb086ffce170cc2a75c9794..5cefe6fae0f302c616bcf166d4b8060e210dc7b0 100644 (file)
--- a/ceph/src/test/librbd/object_map/test_mock_InvalidateRequest.cc
+++ b/ceph/src/test/librbd/object_map/test_mock_InvalidateRequest.cc
@@ -40,8 +40,8 @@ TEST_F(TestMockObjectMapInvalidateRequest, UpdatesInMemoryFlag) {
                 .Times(0);
 
   {
-    RWLock::RLocker owner_locker(ictx->owner_lock);
-    RWLock::WLocker snap_locker(ictx->snap_lock);
+    std::shared_lock owner_locker{ictx->owner_lock};
+    std::unique_lock image_locker{ictx->image_lock};
     request->send();
   }
   ASSERT_EQ(0, cond_ctx.wait());
@@ -66,8 +66,8 @@ TEST_F(TestMockObjectMapInvalidateRequest, UpdatesHeadOnDiskFlag) {
                 .WillOnce(DoDefault());
 
   {
-    RWLock::RLocker owner_locker(ictx->owner_lock);
-    RWLock::WLocker snap_locker(ictx->snap_lock);
+    std::shared_lock owner_locker{ictx->owner_lock};
+    std::unique_lock image_locker{ictx->image_lock};
     request->send();
   }
   ASSERT_EQ(0, cond_ctx.wait());
@@ -95,8 +95,8 @@ TEST_F(TestMockObjectMapInvalidateRequest, UpdatesSnapOnDiskFlag) {
                 .WillOnce(DoDefault());
 
   {
-    RWLock::RLocker owner_locker(ictx->owner_lock);
-    RWLock::WLocker snap_locker(ictx->snap_lock);
+    std::shared_lock owner_locker{ictx->owner_lock};
+    std::unique_lock image_locker{ictx->image_lock};
     request->send();
   }
   ASSERT_EQ(0, cond_ctx.wait());
@@ -116,8 +116,8 @@ TEST_F(TestMockObjectMapInvalidateRequest, SkipOnDiskUpdateWithoutLock) {
                 .Times(0);
 
   {
-    RWLock::RLocker owner_locker(ictx->owner_lock);
-    RWLock::WLocker snap_locker(ictx->snap_lock);
+    std::shared_lock owner_locker{ictx->owner_lock};
+    std::unique_lock image_locker{ictx->image_lock};
     request->send();
   }
   ASSERT_EQ(0, cond_ctx.wait());
@@ -140,8 +140,8 @@ TEST_F(TestMockObjectMapInvalidateRequest, IgnoresOnDiskUpdateFailure) {
                 .WillOnce(Return(-EINVAL));
 
   {
-    RWLock::RLocker owner_locker(ictx->owner_lock);
-    RWLock::WLocker snap_locker(ictx->snap_lock);
+    std::shared_lock owner_locker{ictx->owner_lock};
+    std::unique_lock image_locker{ictx->image_lock};
     request->send();
   }
   ASSERT_EQ(0, cond_ctx.wait());