summaryrefslogtreecommitdiff
path: root/src/mds/Server.cc
diff options
context:
space:
mode:
authorRoald J. van Loon <roaldvanloon@gmail.com>2012-12-24 13:10:57 +0100
committerRoald van Loon <roaldvanloon@gmail.com>2012-12-24 22:26:56 +0000
commit17ae36a5420eb4568f93ba3d9f185dfbc0a42918 (patch)
treeae06815a5638dea51b98466d81b6b0c5a46f987d /src/mds/Server.cc
parent18001d059656224abbf7d92c1c54befd33ec8d6e (diff)
downloadceph-wip-dout.tar.gz
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>
Diffstat (limited to 'src/mds/Server.cc')
-rw-r--r--src/mds/Server.cc49
1 files changed, 24 insertions, 25 deletions
diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index e5e967afcbb..36c83915a14 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -12,19 +12,21 @@
*
*/
-#include "MDS.h"
-#include "Server.h"
-#include "Locker.h"
-#include "MDCache.h"
-#include "MDLog.h"
-#include "Migrator.h"
-#include "MDBalancer.h"
-#include "AnchorClient.h"
-#include "InoTable.h"
-#include "SnapClient.h"
-#include "Mutation.h"
+#include "mds_types.h"
+
+#include <errno.h>
+#include <fcntl.h>
+#include <list>
+#include <iostream>
+#include "include/filepath.h"
+#include "include/compat.h"
+#include "common/Timer.h"
+#include "common/perf_counters.h"
+#include "common/config.h"
#include "msg/Messenger.h"
+#include "osd/OSDMap.h"
+#include "global/debug.h"
#include "messages/MClientSession.h"
#include "messages/MClientRequest.h"
@@ -32,11 +34,8 @@
#include "messages/MClientReconnect.h"
#include "messages/MClientCaps.h"
#include "messages/MClientSnap.h"
-
#include "messages/MMDSSlaveRequest.h"
-
#include "messages/MLock.h"
-
#include "messages/MDentryUnlink.h"
#include "events/EString.h"
@@ -46,21 +45,21 @@
#include "events/EOpen.h"
#include "events/ECommitted.h"
-#include "include/filepath.h"
-#include "common/Timer.h"
-#include "common/perf_counters.h"
-#include "include/compat.h"
+#include "MDS.h"
+#include "Locker.h"
+#include "MDCache.h"
+#include "MDLog.h"
+#include "Migrator.h"
+#include "MDBalancer.h"
+#include "AnchorClient.h"
+#include "InoTable.h"
+#include "SnapClient.h"
+#include "Mutation.h"
-#include <errno.h>
-#include <fcntl.h>
+#include "Server.h"
-#include <list>
-#include <iostream>
using namespace std;
-#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() << ".server "