From 1fa099646a1bcfae2a92e6eaa10e33a7f76703f1 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 10 Mar 2021 21:00:55 +0800 Subject: [PATCH] test/librbd: s/RWLock/share_lock/ to consolidate the code base further, we don't need to use the homebrewed shared lock unless the std::shared_mutex cannot fufill our needs. Signed-off-by: Kefu Chai --- src/test/librbd/mock/io/MockObjectDispatch.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/librbd/mock/io/MockObjectDispatch.h b/src/test/librbd/mock/io/MockObjectDispatch.h index baf86d9fb85e..f6e75d2042e7 100644 --- a/src/test/librbd/mock/io/MockObjectDispatch.h +++ b/src/test/librbd/mock/io/MockObjectDispatch.h @@ -5,6 +5,7 @@ #define CEPH_TEST_LIBRBD_MOCK_IO_OBJECT_DISPATCH_H #include "gmock/gmock.h" +#include "common/ceph_mutex.h" #include "librbd/io/ObjectDispatchInterface.h" #include "librbd/io/Types.h" @@ -15,10 +16,9 @@ namespace io { struct MockObjectDispatch : public ObjectDispatchInterface { public: - RWLock lock; + ceph::shared_mutex lock = ceph::make_shared_mutex("MockObjectDispatch::lock"); - MockObjectDispatch() : lock("MockObjectDispatch::lock", true, false) { - } + MockObjectDispatch() {} MOCK_CONST_METHOD0(get_dispatch_layer, ObjectDispatchLayer()); -- 2.47.3