compile fixups for dout

Signed-off-by: Jesse Williamson <jwilliamson@suse.de>

src/mds/PurgeQueue.cc

@@ -19,6 +19,8 @@
 
 #include "PurgeQueue.h"
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
 
 #define dout_context cct
 #define dout_subsys ceph_subsys_mds

src/mds/RecoveryQueue.cc

@@ -20,6 +20,8 @@
 
 #include "RecoveryQueue.h"
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
 
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_mds

src/mgr/ClusterState.cc

@@ -16,6 +16,9 @@
 
 #include "mgr/ClusterState.h"
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
+
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_mgr
 #undef dout_prefix

src/mgr/DaemonServer.cc

@@ -24,6 +24,9 @@
 #include "messages/MPGStats.h"
 #include "messages/MOSDScrub.h"
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
+
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_mgr
 #undef dout_prefix

src/mgr/DaemonState.cc

@@ -13,6 +13,9 @@
 
 #include "DaemonState.h"
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
+
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_mgr
 #undef dout_prefix

src/mgr/Mgr.cc

@@ -33,6 +33,9 @@
 
 #include "Mgr.h"
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
+
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_mgr
 #undef dout_prefix

src/mgr/MgrClient.cc

@@ -25,6 +25,9 @@
 #include "messages/MCommandReply.h"
 #include "messages/MPGStats.h"
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
+
 #define dout_subsys ceph_subsys_mgrc
 #undef dout_prefix
 #define dout_prefix *_dout << "mgrc " << __func__ << " "

src/mon/MonClient.cc

@@ -39,6 +39,8 @@
 #include "auth/AuthMethodList.h"
 #include "auth/RotatingKeyRing.h"
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_monc
 #undef dout_prefix

src/msg/Message.cc

@@ -190,6 +190,9 @@ using namespace std;
 
 #define DEBUGLVL  10    // debug level of output
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
+
 #define dout_subsys ceph_subsys_ms
 
 void Message::encode(uint64_t features, int crcflags)

src/msg/Messenger.cc

@@ -14,6 +14,9 @@
 #include "msg/xio/XioMessenger.h"
 #endif
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
+
 Messenger *Messenger::create_client_messenger(CephContext *cct, string lname)
 {
   std::string public_msgr_type = cct->_conf->ms_public_type.empty() ? cct->_conf->get_val<std::string>("ms_type") : cct->_conf->ms_public_type;

src/msg/async/PosixStack.cc

@@ -30,9 +30,11 @@
 #include "common/errno.h"
 #include "common/strtol.h"
 #include "common/dout.h"
-#include "include/assert.h"
 #include "common/simple_spin.h"
 
+// re-include our assert to clobber the system one; fix dout:
+#include "include/assert.h"
+
 #define dout_subsys ceph_subsys_ms
 #undef dout_prefix
 #define dout_prefix *_dout << "PosixStack "

src/msg/async/rdma/Infiniband.cc

@@ -19,6 +19,9 @@
 #include "common/debug.h"
 #include "RDMAStack.h"
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
+
 #define dout_subsys ceph_subsys_ms
 #undef dout_prefix
 #define dout_prefix *_dout << "Infiniband "

src/msg/async/rdma/Infiniband.h

@@ -17,11 +17,11 @@
 #ifndef CEPH_INFINIBAND_H
 #define CEPH_INFINIBAND_H
 
-#include <infiniband/verbs.h>
-
 #include <string>
 #include <vector>
 
+#include <infiniband/verbs.h>
+
 #include "include/int_types.h"
 #include "include/page.h"
 #include "common/debug.h"
@@ -30,6 +30,9 @@
 #include "msg/async/net_handler.h"
 #include "common/Mutex.h"
 
+// re-include our assert to clobber the system one; fix dout:
+#include "include/assert.h"
+
 #define HUGE_PAGE_SIZE (2 * 1024 * 1024)
 #define ALIGN_TO_PAGE_SIZE(x) \
   (((x) + HUGE_PAGE_SIZE -1) / HUGE_PAGE_SIZE * HUGE_PAGE_SIZE)

src/msg/async/rdma/RDMAConnectedSocketImpl.cc

@@ -16,6 +16,9 @@
 
 #include "RDMAStack.h"
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
+
 #define dout_subsys ceph_subsys_ms
 #undef dout_prefix
 #define dout_prefix *_dout << " RDMAConnectedSocketImpl "

src/msg/async/rdma/RDMAServerSocketImpl.cc

@@ -17,6 +17,9 @@
 #include "msg/async/net_handler.h"
 #include "RDMAStack.h"
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
+
 #define dout_subsys ceph_subsys_ms
 #undef dout_prefix
 #define dout_prefix *_dout << " RDMAServerSocketImpl "

src/msg/async/rdma/RDMAStack.cc

@@ -23,6 +23,9 @@
 #include "common/Tub.h"
 #include "RDMAStack.h"
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
+
 #define dout_subsys ceph_subsys_ms
 #undef dout_prefix
 #define dout_prefix *_dout << "RDMAStack "