common,crush,mds,messages,osd: add missing #include

they rely on dout.h to do this, but they should not.

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

diff --git a/src/common/PluginRegistry.cc b/src/common/PluginRegistry.cc
index 7faf0473be7e29471d5170577a13d9c43cbb572d..a96c98cbd5cbf040ed0c10c2e3f9cb1773619af8 100644 (file)
--- a/src/common/PluginRegistry.cc
+++ b/src/common/PluginRegistry.cc
@@ -17,6 +17,7 @@
 
 #include "PluginRegistry.h"
 #include "ceph_ver.h"
+#include "common/ceph_context.h"
 #include "common/errno.h"
 #include "common/debug.h"
 

diff --git a/src/common/TrackedOp.h b/src/common/TrackedOp.h
index 704a92ee94ff5d971ce96899294f27d26ff3fc4b..75a95a11eb11a2ee661843a4809d7382cdd7c1b0 100644 (file)
--- a/src/common/TrackedOp.h
+++ b/src/common/TrackedOp.h
@@ -18,6 +18,7 @@
 #include "common/histogram.h"
 #include "msg/Message.h"
 #include "common/RWLock.h"
+#include "common/Thread.h"
 
 #define OPTRACKER_PREALLOC_EVENTS 20
 

diff --git a/src/common/admin_socket.cc b/src/common/admin_socket.cc
index a49298c6b403a9e97acfcee44f1dbe24b7b4f386..cc73e5cf2614a92533af8761d34c2606c9da4653 100644 (file)
--- a/src/common/admin_socket.cc
+++ b/src/common/admin_socket.cc
@@ -19,6 +19,7 @@
 #include "common/dout.h"
 #include "common/errno.h"
 #include "common/pipe.h"
+#include "common/safe_io.h"
 #include "common/Thread.h"
 #include "common/version.h"
 

diff --git a/src/common/cmdparse.cc b/src/common/cmdparse.cc
index 241aa3fa9ea0ad827a31837354abafe2e6db713d..38194c8c418c56a08bce797b07aaf6a8845f05d1 100644 (file)
--- a/src/common/cmdparse.cc
+++ b/src/common/cmdparse.cc
@@ -12,9 +12,11 @@
  *
  */
 
-#include "json_spirit/json_spirit.h"
+#include "common/cmdparse.h"
+#include "common/Formatter.h"
 #include "common/debug.h"
-
+#include "common/strtol.h"
+#include "json_spirit/json_spirit.h"
 
 /**
  * Given a cmddesc like "foo baz name=bar,type=CephString",

diff --git a/src/common/common_init.cc b/src/common/common_init.cc
index 7799165e763a402429dbc329c42d5be492e3301b..30dd2b28d83779a0d65c284a805d7cb0a55ec150 100644 (file)
--- a/src/common/common_init.cc
+++ b/src/common/common_init.cc
@@ -12,12 +12,13 @@
  *
  */
 
+#include "common/common_init.h"
 #include "common/admin_socket.h"
 #include "common/ceph_argparse.h"
 #include "common/ceph_context.h"
-#include "common/common_init.h"
 #include "common/config.h"
 #include "common/dout.h"
+#include "common/strtol.h"
 #include "common/valgrind.h"
 #include "common/zipkin_trace.h"
 

diff --git a/src/common/lockdep.cc b/src/common/lockdep.cc
index 8abcbc8e55b9b382258bd34214f6d958b70cca39..91504bb9b482280774b134f189b959f4f6c5ec0f 100644 (file)
--- a/src/common/lockdep.cc
+++ b/src/common/lockdep.cc
@@ -12,6 +12,7 @@
  *
  */
 #include "lockdep.h"
+#include "common/ceph_context.h"
 #include "common/dout.h"
 #include "common/valgrind.h"
 

diff --git a/src/crush/CrushLocation.cc b/src/crush/CrushLocation.cc
index b5a32282a008df4821db24caa5adf2e6cb81468c..a73a739c785c637f0a5d2d6006fe49f4bde5d508 100644 (file)
--- a/src/crush/CrushLocation.cc
+++ b/src/crush/CrushLocation.cc
@@ -4,6 +4,7 @@
 #include "include/compat.h"
 #include "CrushLocation.h"
 #include "CrushWrapper.h"
+#include "common/ceph_context.h"
 #include "common/config.h"
 #include "include/str_list.h"
 #include "common/debug.h"

diff --git a/src/mds/FSMap.cc b/src/mds/FSMap.cc
index 87a6a5362d9de973636aff367668e8d25ea50b9b..666a282d02546470702883450c22e7bc1e9bea97 100644 (file)
--- a/src/mds/FSMap.cc
+++ b/src/mds/FSMap.cc
@@ -16,10 +16,11 @@
 #include "FSMap.h"
 
 #include <sstream>
-using std::stringstream;
-
+#include "common/config_proxy.h"
+#include "global/global_context.h"
 #include "mon/health_check.h"
 
+using std::stringstream;
 
 void Filesystem::dump(Formatter *f) const
 {

diff --git a/src/mds/MDSContext.h b/src/mds/MDSContext.h
index 0ea688533477315fbf8690522d6aad6d766692ec..119b3141906f0e36df90b85a30d86f70ffdb5090 100644 (file)
--- a/src/mds/MDSContext.h
+++ b/src/mds/MDSContext.h
@@ -21,6 +21,7 @@
 
 #include "include/Context.h"
 #include "include/elist.h"
+#include "include/spinlock.h"
 #include "common/ceph_time.h"
 
 class MDSRank;

diff --git a/src/messages/MOSDOpReply.h b/src/messages/MOSDOpReply.h
index 625a0f7405221397a7600480b16e1c15909caeea..33ff6ddc4f17b01105f03ee1d8bcdc2cbb8d44b1 100644 (file)
--- a/src/messages/MOSDOpReply.h
+++ b/src/messages/MOSDOpReply.h
@@ -19,7 +19,6 @@
 #include "msg/Message.h"
 
 #include "MOSDOp.h"
-#include "os/ObjectStore.h"
 #include "common/errno.h"
 
 /*

diff --git a/src/messages/MOSDRepOpReply.h b/src/messages/MOSDRepOpReply.h
index 8f158bce0abd988f858aa2f69a7a40d29e3dc831..887242016ccbaa1e9781a4559f530a2def957e1d 100644 (file)
--- a/src/messages/MOSDRepOpReply.h
+++ b/src/messages/MOSDRepOpReply.h
@@ -18,8 +18,6 @@
 
 #include "MOSDFastDispatchOp.h"
 
-#include "os/ObjectStore.h"
-
 /*
  * OSD Client Subop reply
  *

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index ecc2683e66c3feeb3e53268d771a60b2ed27cdff..9b9b6a3ae91b6b980767e8bd00c80849a6e9068f 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -24,6 +24,7 @@
 #include "common/errno.h"
 #include "common/Formatter.h"
 #include "common/TextTable.h"
+#include "global/global_context.h"
 #include "include/ceph_features.h"
 #include "include/str_map.h"
 

diff --git a/src/osd/Session.h b/src/osd/Session.h
index 127e287c84544942537d3f987ad690b04e179743..ae76397f8f2c65c5724061e68b55360f3e5a7ec3 100644 (file)
--- a/src/osd/Session.h
+++ b/src/osd/Session.h
@@ -17,6 +17,7 @@
 
 #include "common/RefCountedObj.h"
 #include "common/Mutex.h"
+#include "global/global_context.h"
 #include "include/spinlock.h"
 #include "OSDCap.h"
 #include "Watch.h"

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 6668fa2f1efd1639b7f1f792da750b531224a53e..81ce073814f2d0b1d0c60e55a1361546c9ee51c0 100644 (file)
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -22,9 +22,7 @@
 extern "C" {
 #include "crush/hash.h"
 }
-#include "PG.h"
 #include "OSDMap.h"
-#include "PGBackend.h"
 
 const char *ceph_osd_flag_name(unsigned flag)
 {