cleanup: debug.h/dout.h and global_ceph_context changes

- forgot rest_bench.cc, resulting in --with-rest-bench build failure
- added debug.h in some more places so we don't rely on magic forwards

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>

27 files changed, 33 insertions, 3 deletions

diff --git a/src/client/SyntheticClient.cc b/src/client/SyntheticClient.cc
index b2a936f55ac..fae48111abc 100644
--- a/src/client/SyntheticClient.cc
+++ b/src/client/SyntheticClient.cc
@@ -34,6 +34,7 @@ using namespace std;
 #include <sys/statvfs.h>
 
 #include "include/assert.h"
+#include "global/debug.h"
 
 #define dout_subsys ceph_subsys_client
 #undef dout_prefix
diff --git a/src/mds/AnchorClient.cc b/src/mds/AnchorClient.cc
index 7900da4ce61..5be31a7fac7 100644
--- a/src/mds/AnchorClient.cc
+++ b/src/mds/AnchorClient.cc
@@ -22,6 +22,8 @@
 
 #include "common/config.h"
 
+#include "global/debug.h"
+
 #define dout_subsys ceph_subsys_mds
 #undef dout_prefix
 #define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".anchorclient "
diff --git a/src/mds/AnchorServer.cc b/src/mds/AnchorServer.cc
index cd2e625e49d..f5e29493cab 100644
--- a/src/mds/AnchorServer.cc
+++ b/src/mds/AnchorServer.cc
@@ -17,6 +17,8 @@
 #include "msg/Messenger.h"
 #include "messages/MMDSTableRequest.h"
 
+#include "global/debug.h"
+
 #define dout_subsys ceph_subsys_mds
 #undef dout_prefix
 #define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".anchorserver "
diff --git a/src/mds/CDentry.cc b/src/mds/CDentry.cc
index 7dd88ac10a7..d123ab9ce22 100644
--- a/src/mds/CDentry.cc
+++ b/src/mds/CDentry.cc
@@ -26,6 +26,8 @@
 
 #include "messages/MLock.h"
 
+#include "global/debug.h"
+
 #define dout_subsys ceph_subsys_mds
 #undef dout_prefix
 #define dout_prefix *_dout << "mds." << dir->cache->mds->get_nodeid() << ".cache.den(" << dir->dirfrag() << " " << name << ") "
diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index 4b1d3ef76bc..f0a04aeec86 100644
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -35,6 +35,7 @@
 
 #include "common/config.h"
 #include "include/assert.h"
+#include "global/debug.h"
 
 #define dout_subsys ceph_subsys_mds
 #undef dout_prefix
diff --git a/src/mds/InoTable.cc b/src/mds/InoTable.cc
index 426b9150ea6..5c23996ea4a 100644
--- a/src/mds/InoTable.cc
+++ b/src/mds/InoTable.cc
@@ -18,6 +18,7 @@
 #include "include/types.h"
 
 #include "common/config.h"
+#include "global/debug.h"
 
 #define dout_subsys ceph_subsys_mds
 #undef dout_prefix
diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index d5d5e6b4c37..9cdf0823a77 100644
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -54,6 +54,7 @@
 #include <errno.h>
 
 #include "common/config.h"
+#include "global/debug.h"
 
 
 #define dout_subsys ceph_subsys_mds
diff --git a/src/mds/LogEvent.cc b/src/mds/LogEvent.cc
index 0c3b965f86a..b4cc1968024 100644
--- a/src/mds/LogEvent.cc
+++ b/src/mds/LogEvent.cc
@@ -17,6 +17,8 @@
 
 #include "MDS.h"
 
+#include "global/debug.h"
+
 // events i know of
 #include "events/EString.h"
 
diff --git a/src/mds/MDBalancer.cc b/src/mds/MDBalancer.cc
index e39464c3b5f..49cd46b7196 100644
--- a/src/mds/MDBalancer.cc
+++ b/src/mds/MDBalancer.cc
@@ -36,6 +36,7 @@ using std::map;
 using std::vector;
 
 #include "common/config.h"
+#include "global/debug.h"
 
 #define dout_subsys ceph_subsys_mds
 #undef DOUT_COND
diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 58a8b8a2a34..c0c2ae6ad64 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -97,6 +97,7 @@ extern struct ceph_file_layout g_default_file_layout;
 
 #include "common/config.h"
 #include "include/assert.h"
+#include "global/debug.h"
 
 #define dout_subsys ceph_subsys_mds
 #undef dout_prefix
diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc
index 4284b6dfdf1..f6056543417 100644
--- a/src/mds/MDLog.cc
+++ b/src/mds/MDLog.cc
@@ -27,6 +27,7 @@
 #include "common/config.h"
 #include "common/errno.h"
 #include "include/assert.h"
+#include "global/debug.h"
 
 #define dout_subsys ceph_subsys_mds
 #undef DOUT_COND
diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index cbcda25a8dd..4d6a2734779 100644
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -78,6 +78,7 @@
 #include "perfglue/cpu_profiler.h"
 #include "perfglue/heap_profiler.h"
 
+#include "global/debug.h"
 
 #define dout_subsys ceph_subsys_mds
 #undef dout_prefix
diff --git a/src/mds/MDSTable.cc b/src/mds/MDSTable.cc
index ed08f25ac94..bd2c45bb005 100644
--- a/src/mds/MDSTable.cc
+++ b/src/mds/MDSTable.cc
@@ -23,6 +23,7 @@
 
 #include "common/config.h"
 #include "include/assert.h"
+#include "global/debug.h"
 
 
 #define dout_subsys ceph_subsys_mds
diff --git a/src/mds/MDSTableClient.cc b/src/mds/MDSTableClient.cc
index 1d2c77bc4be..f256aa8fdd3 100644
--- a/src/mds/MDSTableClient.cc
+++ b/src/mds/MDSTableClient.cc
@@ -29,6 +29,7 @@
 #include "messages/MMDSTableRequest.h"
 
 #include "common/config.h"
+#include "global/debug.h"
 
 #define dout_subsys ceph_subsys_mds
 #undef dout_prefix
diff --git a/src/mds/MDSTableServer.cc b/src/mds/MDSTableServer.cc
index cfa308753dc..f2e59e03217 100644
--- a/src/mds/MDSTableServer.cc
+++ b/src/mds/MDSTableServer.cc
@@ -20,6 +20,8 @@
 #include "messages/MMDSTableRequest.h"
 #include "events/ETableServer.h"
 
+#include "global/debug.h"
+
 #define dout_subsys ceph_subsys_mds
 #undef dout_prefix
 #define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".tableserver(" << get_mdstable_name(table) << ") "
diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index a804eab7731..d0ef16b2793 100644
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -73,7 +73,7 @@
  */
 
 #include "common/config.h"
-
+#include "global/debug.h"
 
 #define dout_subsys ceph_subsys_mds
 #undef DOUT_COND
diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index ba436566dec..e5e967afcbb 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -59,6 +59,7 @@
 using namespace std;
 
 #include "common/config.h"
+#include "global/debug.h"
 
 #define dout_subsys ceph_subsys_mds
 #undef dout_prefix
diff --git a/src/mds/SessionMap.cc b/src/mds/SessionMap.cc
index af150f1f6b9..de0d11232bd 100644
--- a/src/mds/SessionMap.cc
+++ b/src/mds/SessionMap.cc
@@ -19,6 +19,7 @@
 
 #include "common/config.h"
 #include "include/assert.h"
+#include "global/debug.h"
 
 #define dout_subsys ceph_subsys_mds
 #undef dout_prefix
diff --git a/src/mds/SnapServer.cc b/src/mds/SnapServer.cc
index d15c6ad9dbf..a9a97c5fad9 100644
--- a/src/mds/SnapServer.cc
+++ b/src/mds/SnapServer.cc
@@ -25,6 +25,7 @@
 
 #include "common/config.h"
 #include "include/assert.h"
+#include "global/debug.h"
 
 #define dout_subsys ceph_subsys_mds
 #undef dout_prefix
diff --git a/src/mds/flock.cc b/src/mds/flock.cc
index 0deb900f0b0..74e6989474c 100644
--- a/src/mds/flock.cc
+++ b/src/mds/flock.cc
@@ -2,7 +2,7 @@
 // vim: ts=8 sw=2 smarttab
 #include <errno.h>
 
-#include "common/debug.h"
+#include "global/debug.h"
 #include "mdstypes.h"
 #include "mds/flock.h"
 
diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index 46adbf2bac9..c85d9dbe448 100644
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -51,6 +51,8 @@
 
 #include "Locker.h"
 
+#include "global/debug.h"
+
 #define dout_subsys ceph_subsys_mds
 #undef DOUT_COND
 #define DOUT_COND(cct, l) (l<=cct->_conf->debug_mds || l <= cct->_conf->debug_mds_log \
diff --git a/src/mds/snap.cc b/src/mds/snap.cc
index fa434b79d02..d7392d2959a 100644
--- a/src/mds/snap.cc
+++ b/src/mds/snap.cc
@@ -17,6 +17,7 @@
 #include "MDS.h"
 
 #include "messages/MClientSnap.h"
+#include "global/debug.h"
 
 /*
  * SnapRealm
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 981e036b959..e0376e19f2d 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -98,6 +98,7 @@
 
 #include "global/signal_handler.h"
 #include "global/pidfile.h"
+#include "global/debug.h"
 
 #include "include/color.h"
 #include "perfglue/cpu_profiler.h"
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 612dc4a8677..2a8f3ec5f8e 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -40,6 +40,7 @@
 
 #include "common/config.h"
 #include "include/compat.h"
+#include "global/debug.h"
 
 #include "json_spirit/json_spirit_value.h"
 #include "json_spirit/json_spirit_reader.h"
diff --git a/src/rgw/rgw_aclparser.cc b/src/rgw/rgw_aclparser.cc
index 8eb2a5eb28d..414e0e31ec7 100644
--- a/src/rgw/rgw_aclparser.cc
+++ b/src/rgw/rgw_aclparser.cc
@@ -3,6 +3,7 @@
 #include "common/ceph_context.h"
 #include "include/types.h"
 #include "rgw/rgw_acl.h"
+#include "global/debug.h"
 
 #include <iostream>
 #include <map>
diff --git a/src/rgw/rgw_cache.cc b/src/rgw/rgw_cache.cc
index 97a5e47d0f7..e870df25c0d 100644
--- a/src/rgw/rgw_cache.cc
+++ b/src/rgw/rgw_cache.cc
@@ -1,4 +1,5 @@
 #include "rgw_cache.h"
+#include "common/debug.h"
 
 #include <errno.h>
 
diff --git a/src/tools/rest_bench.cc b/src/tools/rest_bench.cc
index 8e8649d213e..a57e9a8688d 100644
--- a/src/tools/rest_bench.cc
+++ b/src/tools/rest_bench.cc
@@ -17,11 +17,11 @@
 
 #include "common/obj_bencher.h"
 #include "common/config.h"
-#include "common/debug.h"
 #include "common/ceph_argparse.h"
 #include "common/WorkQueue.h"
 #include "msg/Message.h"
 #include "global/global_init.h"
+#include "global/debug.h"
 
 #include "libs3.h"