summaryrefslogtreecommitdiff
path: root/src/mon/MonitorStore.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/mon/MonitorStore.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/mon/MonitorStore.cc')
-rw-r--r--src/mon/MonitorStore.cc31
1 files changed, 16 insertions, 15 deletions
diff --git a/src/mon/MonitorStore.cc b/src/mon/MonitorStore.cc
index fa14783ccd2..6dc5391af71 100644
--- a/src/mon/MonitorStore.cc
+++ b/src/mon/MonitorStore.cc
@@ -11,8 +11,22 @@
* Foundation. See file COPYING.
*
*/
+#include "mon_types.h"
-#include "MonitorStore.h"
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sstream>
+#include <sys/file.h>
+
+#if defined(__FreeBSD__)
+#include <sys/param.h>
+#endif
+
+#include "include/compat.h"
#include "common/Clock.h"
#include "common/entity_name.h"
#include "common/errno.h"
@@ -22,11 +36,7 @@
#include "common/sync_filesystem.h"
#include "global/debug.h"
-#if defined(__FreeBSD__)
-#include <sys/param.h>
-#endif
-
-#include "include/compat.h"
+#include "MonitorStore.h"
#define dout_subsys ceph_subsys_mon
#undef dout_prefix
@@ -35,15 +45,6 @@ static ostream& _prefix(std::ostream *_dout, const string& dir) {
return *_dout << "store(" << dir << ") ";
}
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sstream>
-#include <sys/file.h>
-
int MonitorStore::mount()
{
char t[1024];