From: Kefu Chai <kchai@redhat.com>
Date: Fri, 31 Aug 2018 13:17:48 +0000 (+0800)
Subject: common,crush,mds,messages,osd: add missing #include
X-Git-Tag: v14.0.1~396^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e2f966a800e369a033fac168ec7fa7eac44cc6b1;p=ceph.git

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 7faf0473be7e..a96c98cbd5cb 100644
--- 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 704a92ee94ff..75a95a11eb11 100644
--- 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 a49298c6b403..cc73e5cf2614 100644
--- 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 241aa3fa9ea0..38194c8c418c 100644
--- 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 7799165e763a..30dd2b28d837 100644
--- 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 8abcbc8e55b9..91504bb9b482 100644
--- 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 b5a32282a008..a73a739c785c 100644
--- 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 87a6a5362d9d..666a282d0254 100644
--- 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 0ea688533477..119b3141906f 100644
--- 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 625a0f740522..33ff6ddc4f17 100644
--- 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 8f158bce0abd..887242016ccb 100644
--- 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 ecc2683e66c3..9b9b6a3ae91b 100644
--- 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 127e287c8454..ae76397f8f2c 100644
--- 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 6668fa2f1efd..81ce073814f2 100644
--- 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)
 {