common/config: push down Mutex #include

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/common/config.h b/src/common/config.h
index 2e318c0416edfc70e92a4db0fb97eadd638b339f..0a6ef80372fd153da038ea6715fa3780d9f22df9 100644 (file)
--- a/src/common/config.h
+++ b/src/common/config.h
@@ -19,7 +19,6 @@
 #include <boost/container/small_vector.hpp>
 #include "common/ConfUtils.h"
 #include "common/code_environment.h"
-#include "common/Mutex.h"
 #include "log/SubsystemMap.h"
 #include "common/options.h"
 #include "common/subsys_types.h"

diff --git a/src/global/signal_handler.cc b/src/global/signal_handler.cc
index 45155b3bf16e13e387bed06d6707941be2b86266..59e849b2e1a7102795bd9d42f93cfc38441c0ab8 100644 (file)
--- a/src/global/signal_handler.cc
+++ b/src/global/signal_handler.cc
@@ -17,6 +17,7 @@
 #include "include/compat.h"
 #include "pthread.h"
 
+#include "common/Mutex.h"
 #include "common/BackTrace.h"
 #include "common/debug.h"
 #include "common/safe_io.h"

diff --git a/src/include/Context.h b/src/include/Context.h
index 050a7fdfbb9c5121c280006a0b3446d7a04af0f3..7068f8f2400521257286f72e6d71f68c003432cc 100644 (file)
--- a/src/include/Context.h
+++ b/src/include/Context.h
@@ -24,6 +24,7 @@
 #include <memory>
 
 #include "include/ceph_assert.h"
+#include "common/Mutex.h"
 
 #define mydout(cct, v) lgeneric_subdout(cct, context, v)
 

diff --git a/src/librbd/api/Snapshot.cc b/src/librbd/api/Snapshot.cc
index 0015adadb2a0a973ab905fd39dfe47065ebb6b87..99010bf4d3537840ef5744d9d48dd792f0dc7373 100644 (file)
--- a/src/librbd/api/Snapshot.cc
+++ b/src/librbd/api/Snapshot.cc
@@ -9,6 +9,8 @@
 #include "librbd/Operations.h"
 #include "librbd/Utils.h"
 #include <boost/variant.hpp>
+#include "include/Context.h"
+#include "common/Cond.h"
 
 #define dout_subsys ceph_subsys_rbd
 #undef dout_prefix

diff --git a/src/msg/Connection.h b/src/msg/Connection.h
index 39b277310e30eff994f86ab9e0bc9af1890e122e..fa516e81025a14739c75a08ee4f2794dea1438b4 100644 (file)
--- a/src/msg/Connection.h
+++ b/src/msg/Connection.h
@@ -24,6 +24,7 @@
 #include "common/RefCountedObj.h"
 #include "common/config.h"
 #include "common/debug.h"
+#include "common/Mutex.h"
 #include "include/ceph_assert.h" // Because intusive_ptr clobbers our assert...
 #include "include/buffer.h"
 #include "include/types.h"

diff --git a/src/test/common/test_lockdep.cc b/src/test/common/test_lockdep.cc
index 054001235141ac73fc3e021e71b3c2e8bf306ff0..cbbe081426a8180e763ab955774eed40b9f40e05 100644 (file)
--- a/src/test/common/test_lockdep.cc
+++ b/src/test/common/test_lockdep.cc
@@ -7,6 +7,7 @@
 #include "common/ceph_mutex.h"
 #include "global/global_context.h"
 #include "global/global_init.h"
+#include "common/lockdep.h"
 
 TEST(lockdep, abba)
 {

diff --git a/src/test/compressor/test_compression.cc b/src/test/compressor/test_compression.cc
index 2961b2bdb6bbf00859570ebbe0a0268ff7b92c76..102ab56153db7d73fb9b5b04cb907c3f0bc1495f 100644 (file)
--- a/src/test/compressor/test_compression.cc
+++ b/src/test/compressor/test_compression.cc
@@ -20,6 +20,7 @@
 #include "gtest/gtest.h"
 #include "common/ceph_context.h"
 #include "common/config.h"
+#include "common/Mutex.h"
 #include "compressor/Compressor.h"
 #include "compressor/CompressionPlugin.h"
 #include "global/global_context.h"

diff --git a/src/tools/rbd_mirror/BaseRequest.h b/src/tools/rbd_mirror/BaseRequest.h
index f865f600fd8fa0809fa6c21dd686db4f741dd05f..5053eb830d9781644da6d0b8626380e382b6dadf 100644 (file)
--- a/src/tools/rbd_mirror/BaseRequest.h
+++ b/src/tools/rbd_mirror/BaseRequest.h
@@ -5,6 +5,7 @@
 #define CEPH_RBD_MIRROR_BASE_REQUEST_H
 
 #include "common/RefCountedObj.h"
+#include "include/Context.h"
 
 namespace rbd {
 namespace mirror {