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, 17 insertions, 28 deletions

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index e8e1e6c5427..39c64838120 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -12,6 +12,9 @@
  * 
  */
 
+#include "include/types.h"
+#include "osd/osd_types.h"
+
 #include <inttypes.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -22,65 +25,51 @@
 #include <errno.h>
 #include <dirent.h>
 #include <sys/ioctl.h>
+#include <sstream>
+#include <iostream>
 
 #if defined(__linux__)
 #include <linux/fs.h>
 #include <syscall.h>
 #endif
 
-#include <iostream>
-#include <map>
-
 #if defined(__FreeBSD__)
 #include "include/inttypes.h"
 #endif
 
-#include "include/compat.h"
-#include "include/fiemap.h"
-
-#include "common/xattr.h"
-#include "chain_xattr.h"
-
 #if defined(DARWIN) || defined(__FreeBSD__)
 #include <sys/param.h>
 #include <sys/mount.h>
 #endif // DARWIN
 
-
-#include <fstream>
-#include <sstream>
-
-#include "FileStore.h"
-#include "common/BackTrace.h"
-#include "include/types.h"
-#include "FileJournal.h"
-
-#include "osd/osd_types.h"
+#include "include/compat.h"
+#include "include/fiemap.h"
 #include "include/color.h"
 #include "include/buffer.h"
-
-#include "common/Timer.h"
+#include "common/xattr.h"
+#include "common/BackTrace.h"
+#include "common/config.h"
 #include "common/errno.h"
 #include "common/run_cmd.h"
 #include "common/safe_io.h"
 #include "common/perf_counters.h"
 #include "common/sync_filesystem.h"
 #include "common/fd.h"
-#include "HashIndex.h"
+#include "common/ceph_crypto.h"
+#include "global/debug.h"
+
+#include "chain_xattr.h"
+#include "FileJournal.h"
 #include "DBObjectMap.h"
 #include "LevelDBStore.h"
 
-#include "common/ceph_crypto.h"
-using ceph::crypto::SHA1;
-
 #ifndef __CYGWIN__
 #  include "btrfs_ioctl.h"
 #endif
 
-#include "include/assert.h"
+#include "FileStore.h"
 
-#include "common/config.h"
-#include "global/debug.h"
+using ceph::crypto::SHA1;
 
 #define dout_subsys ceph_subsys_filestore
 #undef dout_prefix