cleanup: changed order of #includes, global_context.h, debug.hwip-dout

- lots of rewriting of #include ordering (see below)
- renamed mdstypes.h to mds_types.h, same as {osd,mon}_types.h
- included global/global_context.h and global/debug.h where used
- fixed lots of duplicate includes

The order of #includes is now;

1. types include (include/types.h, mds/mds_types.h, etc)
2. system includes (like stl, boost, etc)
3. ceph includes (include/..)
4. ceph common (common/..)
5. ceph other (auth/.., os/.., global/.., etc)
6. list of messages/.., if used
7. local includes (headers from same module)
8. own header (<basename>.h)

"using namespace" stuff is always directly below #include, not intermixed with them

(WIP notice: most files have this implemented, but some not yet)

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

1 files changed, 15 insertions, 20 deletions

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index d0ef16b2793..a96f5442f5e 100644
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -11,21 +11,12 @@
  * Foundation.  See file COPYING.
  * 
  */
-
-#include "MDS.h"
-#include "MDCache.h"
-#include "CInode.h"
-#include "CDir.h"
-#include "CDentry.h"
-#include "Migrator.h"
-#include "Locker.h"
-#include "Server.h"
-
-#include "MDBalancer.h"
-#include "MDLog.h"
-#include "MDSMap.h"
+#include "mds_types.h"
 
 #include "include/filepath.h"
+#include "common/config.h"
+#include "msg/Messenger.h"
+#include "global/debug.h"
 
 #include "events/EString.h"
 #include "events/EExport.h"
@@ -33,10 +24,7 @@
 #include "events/EImportFinish.h"
 #include "events/ESessions.h"
 
-#include "msg/Messenger.h"
-
 #include "messages/MClientCaps.h"
-
 #include "messages/MExportDirDiscover.h"
 #include "messages/MExportDirDiscoverAck.h"
 #include "messages/MExportDirCancel.h"
@@ -47,10 +35,20 @@
 #include "messages/MExportDirNotify.h"
 #include "messages/MExportDirNotifyAck.h"
 #include "messages/MExportDirFinish.h"
-
 #include "messages/MExportCaps.h"
 #include "messages/MExportCapsAck.h"
 
+#include "MDS.h"
+#include "MDCache.h"
+#include "CInode.h"
+#include "CDir.h"
+#include "CDentry.h"
+#include "Locker.h"
+#include "Server.h"
+#include "MDBalancer.h"
+#include "MDLog.h"
+
+#include "Migrator.h"
 
 /*
  * this is what the dir->dir_auth values look like
@@ -72,9 +70,6 @@
  *  - auth bit is set if i am listed as first _or_ second dir_auth.
  */
 
-#include "common/config.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_migrator)