From: Sage Weil <sage@redhat.com>
Date: Fri, 19 Oct 2018 16:53:07 +0000 (-0500)
Subject: common/config: push down Mutex #include
X-Git-Tag: v14.1.0~820^2~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=afa10a7c1619f8d5ad676e152e5870571cf28e5c;p=ceph.git

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 2e318c0416ed..0a6ef80372fd 100644
--- 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 45155b3bf16e..59e849b2e1a7 100644
--- 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 050a7fdfbb9c..7068f8f24005 100644
--- 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 0015adadb2a0..99010bf4d353 100644
--- 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 39b277310e30..fa516e81025a 100644
--- 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 054001235141..cbbe081426a8 100644
--- 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 2961b2bdb6bb..102ab56153db 100644
--- 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 f865f600fd8f..5053eb830d97 100644
--- 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 {