librbd,rbd_mirror: do not include RWLock.h unless it is used

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/librbd/AsyncObjectThrottle.cc b/src/librbd/AsyncObjectThrottle.cc
index 6adba21666ebb4ff2f065e9b70f08cd2cf8d08d7..e0fcefff18a03f81be5000b421906bc130ac1838 100644 (file)
--- a/src/librbd/AsyncObjectThrottle.cc
+++ b/src/librbd/AsyncObjectThrottle.cc
@@ -1,7 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 #include "librbd/AsyncObjectThrottle.h"
-#include "common/RWLock.h"
 #include "librbd/AsyncRequest.h"
 #include "librbd/ImageCtx.h"
 #include "librbd/Utils.h"

diff --git a/src/librbd/ObjectMap.h b/src/librbd/ObjectMap.h
index 7577d267f44060c7c4f89eae2e64a4e9c8e940b4..8b5b352ef8aa4c46f2fcf5ca1daba65d8a4b3770 100644 (file)
--- a/src/librbd/ObjectMap.h
+++ b/src/librbd/ObjectMap.h
@@ -10,7 +10,6 @@
 #include "include/rbd/object_map_types.h"
 #include "common/AsyncOpTracker.h"
 #include "common/bit_vector.hpp"
-#include "common/RWLock.h"
 #include "common/RefCountedObj.h"
 #include "librbd/Utils.h"
 #include <boost/optional.hpp>

diff --git a/src/librbd/object_map/ResizeRequest.h b/src/librbd/object_map/ResizeRequest.h
index dccdef133cee0b067574ed44f79052b64aed5747..5d933bb53d7b6fca3a9faae86a30a319ec41931c 100644 (file)
--- a/src/librbd/object_map/ResizeRequest.h
+++ b/src/librbd/object_map/ResizeRequest.h
@@ -9,7 +9,6 @@
 #include "common/bit_vector.hpp"
 
 class Context;
-class RWLock;
 
 namespace librbd {
 

diff --git a/src/librbd/operation/Request.h b/src/librbd/operation/Request.h
index e32b49644cebbfd25a4b7c66787154dbd2522a2a..a36d208575f51a78d50c616253fc739743c4015f 100644 (file)
--- a/src/librbd/operation/Request.h
+++ b/src/librbd/operation/Request.h
@@ -6,7 +6,6 @@
 
 #include "librbd/AsyncRequest.h"
 #include "include/Context.h"
-#include "common/RWLock.h"
 #include "librbd/Utils.h"
 #include "librbd/Journal.h"
 

diff --git a/src/test/librbd/mock/MockImageCtx.h b/src/test/librbd/mock/MockImageCtx.h
index 80307962eb4fd5c2f4de7556a3e83f535dc2df8e..03033c9a09da10102815faec3f83a356926b5f96 100644 (file)
--- a/src/test/librbd/mock/MockImageCtx.h
+++ b/src/test/librbd/mock/MockImageCtx.h
@@ -16,7 +16,6 @@
 #include "test/librbd/mock/MockReadahead.h"
 #include "test/librbd/mock/io/MockImageDispatcher.h"
 #include "test/librbd/mock/io/MockObjectDispatcher.h"
-#include "common/RWLock.h"
 #include "common/WorkQueue.h"
 #include "common/zipkin_trace.h"
 #include "librbd/ImageCtx.h"

diff --git a/src/test/librbd/mock/MockObjectMap.h b/src/test/librbd/mock/MockObjectMap.h
index d72408403e8e91ed995ac5cb63cd3f9c692c4127..2a1adbcaebab3169be17e0898fdcebc5360889d8 100644 (file)
--- a/src/test/librbd/mock/MockObjectMap.h
+++ b/src/test/librbd/mock/MockObjectMap.h
@@ -4,7 +4,6 @@
 #ifndef CEPH_TEST_LIBRBD_MOCK_OBJECT_MAP_H
 #define CEPH_TEST_LIBRBD_MOCK_OBJECT_MAP_H
 
-#include "common/RWLock.h"
 #include "librbd/Utils.h"
 #include "gmock/gmock.h"
 
@@ -16,8 +15,6 @@ struct MockObjectMap {
     return at(object_no);
   }
 
-  MOCK_CONST_METHOD1(enabled, bool(const RWLock &object_map_lock));
-
   MOCK_CONST_METHOD0(size, uint64_t());
 
   MOCK_METHOD1(open, void(Context *on_finish));

diff --git a/src/tools/rbd_mirror/image_map/Policy.h b/src/tools/rbd_mirror/image_map/Policy.h
index 0617bb9eef0d425071a068e406ce7900dc83764b..b256e2f1d8ff16ed23b60bd60c7ededbd4b27d1e 100644 (file)
--- a/src/tools/rbd_mirror/image_map/Policy.h
+++ b/src/tools/rbd_mirror/image_map/Policy.h
@@ -8,7 +8,6 @@
 #include <tuple>
 #include <boost/optional.hpp>
 
-#include "common/RWLock.h"
 #include "cls/rbd/cls_rbd_types.h"
 #include "include/rados/librados.hpp"
 #include "tools/rbd_mirror/image_map/StateTransition.h"