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, 22 insertions, 30 deletions

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index c0c2ae6ad64..9f3ad22be01 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -12,6 +12,10 @@
  * 
  */
 
+extern struct ceph_file_layout g_default_file_layout;
+
+#include "mds_types.h"
+
 #include <errno.h>
 #include <fstream>
 #include <iostream>
@@ -19,34 +23,18 @@
 #include <string>
 #include <map>
 
-#include "MDCache.h"
-#include "MDS.h"
-#include "Server.h"
-#include "Locker.h"
-#include "MDLog.h"
-#include "MDBalancer.h"
-#include "Migrator.h"
-
-#include "AnchorClient.h"
-#include "SnapClient.h"
-
-#include "MDSMap.h"
-
-#include "CInode.h"
-#include "CDir.h"
-
-#include "Mutation.h"
-
 #include "include/ceph_fs.h"
-#include "include/filepath.h"
-
-#include "msg/Message.h"
-#include "msg/Messenger.h"
-
+#include "include/assert.h"
+#include "common/Timer.h"
 #include "common/perf_counters.h"
 #include "common/MemoryModel.h"
+#include "common/config.h"
+#include "msg/Message.h"
+#include "msg/Messenger.h"
 #include "osdc/Journaler.h"
 #include "osdc/Filer.h"
+#include "global/global_context.h"
+#include "global/debug.h"
 
 #include "events/ESubtreeMap.h"
 #include "events/EUpdate.h"
@@ -86,19 +74,23 @@
 
 #include "messages/MMDSFragmentNotify.h"
 
+#include "MDS.h"
+#include "Server.h"
+#include "Locker.h"
+#include "MDLog.h"
+#include "MDBalancer.h"
+#include "Migrator.h"
+#include "Mutation.h"
+
+#include "AnchorClient.h"
+#include "SnapClient.h"
 
 #include "InoTable.h"
 
-#include "common/Timer.h"
+#include "MDCache.h"
 
 using namespace std;
 
-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
 #define dout_prefix _prefix(_dout, mds)