summaryrefslogtreecommitdiffstats
path: root/src/mon
diff options
context:
space:
mode:
Diffstat (limited to 'src/mon')
-rw-r--r--src/mon/AuthMonitor.h4
-rw-r--r--src/mon/ClassMonitor.h4
-rw-r--r--src/mon/Elector.h4
-rw-r--r--src/mon/LogMonitor.h4
-rw-r--r--src/mon/MDSMonitor.h4
-rw-r--r--src/mon/MonCaps.h4
-rw-r--r--src/mon/MonClient.h4
-rw-r--r--src/mon/MonMap.h4
-rw-r--r--src/mon/Monitor.h4
-rw-r--r--src/mon/MonitorStore.h4
-rw-r--r--src/mon/MonmapMonitor.h4
-rw-r--r--src/mon/OSDMonitor.h4
-rw-r--r--src/mon/PGMap.h4
-rw-r--r--src/mon/PGMonitor.h4
-rw-r--r--src/mon/Paxos.h4
-rw-r--r--src/mon/PaxosService.h4
-rw-r--r--src/mon/Session.h4
-rw-r--r--src/mon/mon_types.h4
18 files changed, 36 insertions, 36 deletions
diff --git a/src/mon/AuthMonitor.h b/src/mon/AuthMonitor.h
index d70da029ea7..a9eeeb72297 100644
--- a/src/mon/AuthMonitor.h
+++ b/src/mon/AuthMonitor.h
@@ -12,8 +12,8 @@
*
*/
-#ifndef __AUTHMONITOR_H
-#define __AUTHMONITOR_H
+#ifndef CEPH_AUTHMONITOR_H
+#define CEPH_AUTHMONITOR_H
#include <map>
#include <set>
diff --git a/src/mon/ClassMonitor.h b/src/mon/ClassMonitor.h
index d8e86703f6b..3b4e3fd0cf1 100644
--- a/src/mon/ClassMonitor.h
+++ b/src/mon/ClassMonitor.h
@@ -12,8 +12,8 @@
*
*/
-#ifndef __CLASSMONITOR_H
-#define __CLASSMONITOR_H
+#ifndef CEPH_CLASSMONITOR_H
+#define CEPH_CLASSMONITOR_H
#include <map>
#include <set>
diff --git a/src/mon/Elector.h b/src/mon/Elector.h
index 9bfd7cb644f..04e73c9ed27 100644
--- a/src/mon/Elector.h
+++ b/src/mon/Elector.h
@@ -13,8 +13,8 @@
*/
-#ifndef __MON_ELECTOR_H
-#define __MON_ELECTOR_H
+#ifndef CEPH_MON_ELECTOR_H
+#define CEPH_MON_ELECTOR_H
#include <map>
using namespace std;
diff --git a/src/mon/LogMonitor.h b/src/mon/LogMonitor.h
index 9bd21b2b47d..91e0185b132 100644
--- a/src/mon/LogMonitor.h
+++ b/src/mon/LogMonitor.h
@@ -12,8 +12,8 @@
*
*/
-#ifndef __LOGMONITOR_H
-#define __LOGMONITOR_H
+#ifndef CEPH_LOGMONITOR_H
+#define CEPH_LOGMONITOR_H
#include <map>
#include <set>
diff --git a/src/mon/MDSMonitor.h b/src/mon/MDSMonitor.h
index b833ac1730d..3bb6e724bc0 100644
--- a/src/mon/MDSMonitor.h
+++ b/src/mon/MDSMonitor.h
@@ -15,8 +15,8 @@
/* Metadata Server Monitor
*/
-#ifndef __MDSMONITOR_H
-#define __MDSMONITOR_H
+#ifndef CEPH_MDSMONITOR_H
+#define CEPH_MDSMONITOR_H
#include <map>
#include <set>
diff --git a/src/mon/MonCaps.h b/src/mon/MonCaps.h
index 64ec34dd606..1fcb9321c26 100644
--- a/src/mon/MonCaps.h
+++ b/src/mon/MonCaps.h
@@ -25,8 +25,8 @@
* PAXOS_OSDMAP.
*/
-#ifndef __MONCAPS_H
-#define __MONCAPS_H
+#ifndef CEPH_MONCAPS_H
+#define CEPH_MONCAPS_H
#include "include/types.h"
//#include ""
diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index 4b4beb5744b..e9307abe21f 100644
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -12,8 +12,8 @@
*
*/
-#ifndef __CEPH_MONCLIENT_H
-#define __CEPH_MONCLIENT_H
+#ifndef CEPH_MONCLIENT_H
+#define CEPH_MONCLIENT_H
#include "msg/Dispatcher.h"
#include "msg/Messenger.h"
diff --git a/src/mon/MonMap.h b/src/mon/MonMap.h
index 8125a848fdc..eeb4b521aad 100644
--- a/src/mon/MonMap.h
+++ b/src/mon/MonMap.h
@@ -12,8 +12,8 @@
*
*/
-#ifndef __MONMAP_H
-#define __MONMAP_H
+#ifndef CEPH_MONMAP_H
+#define CEPH_MONMAP_H
#include "include/err.h"
diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index 829c506e346..27095ca3a82 100644
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -20,8 +20,8 @@
* Placement Group (PG) Monitor, Metadata Server (MDS) Monitor, and Client Monitor.
*/
-#ifndef __MONITOR_H
-#define __MONITOR_H
+#ifndef CEPH_MONITOR_H
+#define CEPH_MONITOR_H
#include "include/types.h"
#include "msg/Messenger.h"
diff --git a/src/mon/MonitorStore.h b/src/mon/MonitorStore.h
index a56aa6bc9b5..8025afaaa2c 100644
--- a/src/mon/MonitorStore.h
+++ b/src/mon/MonitorStore.h
@@ -12,8 +12,8 @@
*
*/
-#ifndef __MON_MONITORSTORE_H
-#define __MON_MONITORSTORE_H
+#ifndef CEPH_MON_MONITORSTORE_H
+#define CEPH_MON_MONITORSTORE_H
#include "include/types.h"
#include "include/buffer.h"
diff --git a/src/mon/MonmapMonitor.h b/src/mon/MonmapMonitor.h
index fbb7fa5d8b8..58f28441ccf 100644
--- a/src/mon/MonmapMonitor.h
+++ b/src/mon/MonmapMonitor.h
@@ -16,8 +16,8 @@
* The Monmap Monitor is used to track the monitors in the cluster.
*/
-#ifndef __MONMAPMONITOR_H
-#define __MONMAPMONITOR_H
+#ifndef CEPH_MONMAPMONITOR_H
+#define CEPH_MONMAPMONITOR_H
#include <map>
#include <set>
diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index 0f1f4d914b0..b53f383dc86 100644
--- a/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@ -15,8 +15,8 @@
/* Object Store Device (OSD) Monitor
*/
-#ifndef __OSDMONITOR_H
-#define __OSDMONITOR_H
+#ifndef CEPH_OSDMONITOR_H
+#define CEPH_OSDMONITOR_H
#include <map>
#include <set>
diff --git a/src/mon/PGMap.h b/src/mon/PGMap.h
index ad00037e158..9cec907e366 100644
--- a/src/mon/PGMap.h
+++ b/src/mon/PGMap.h
@@ -18,8 +18,8 @@
* where & is a bit-wise AND and m=2^k-1
*/
-#ifndef __PGMAP_H
-#define __PGMAP_H
+#ifndef CEPH_PGMAP_H
+#define CEPH_PGMAP_H
#include "osd/osd_types.h"
#include <sstream>
diff --git a/src/mon/PGMonitor.h b/src/mon/PGMonitor.h
index 9e0584ee3c1..797c0273729 100644
--- a/src/mon/PGMonitor.h
+++ b/src/mon/PGMonitor.h
@@ -17,8 +17,8 @@
* that are replicated by the same set of devices.
*/
-#ifndef __PGMONITOR_H
-#define __PGMONITOR_H
+#ifndef CEPH_PGMONITOR_H
+#define CEPH_PGMONITOR_H
#include <map>
#include <set>
diff --git a/src/mon/Paxos.h b/src/mon/Paxos.h
index c6eff222fb6..928b17647da 100644
--- a/src/mon/Paxos.h
+++ b/src/mon/Paxos.h
@@ -47,8 +47,8 @@ e 12v
* See PaxosService.h
*/
-#ifndef __MON_PAXOS_H
-#define __MON_PAXOS_H
+#ifndef CEPH_MON_PAXOS_H
+#define CEPH_MON_PAXOS_H
#include "include/types.h"
#include "mon_types.h"
diff --git a/src/mon/PaxosService.h b/src/mon/PaxosService.h
index e168e7790b3..18570a3327b 100644
--- a/src/mon/PaxosService.h
+++ b/src/mon/PaxosService.h
@@ -12,8 +12,8 @@
*
*/
-#ifndef __PAXOSSERVICE_H
-#define __PAXOSSERVICE_H
+#ifndef CEPH_PAXOSSERVICE_H
+#define CEPH_PAXOSSERVICE_H
#include "messages/PaxosServiceMessage.h"
#include "include/Context.h"
diff --git a/src/mon/Session.h b/src/mon/Session.h
index 78e34e7c9b6..ba9c119fd1d 100644
--- a/src/mon/Session.h
+++ b/src/mon/Session.h
@@ -12,8 +12,8 @@
*
*/
-#ifndef __MON_SESSION_H
-#define __MON_SESSION_H
+#ifndef CEPH_MON_SESSION_H
+#define CEPH_MON_SESSION_H
#include "include/xlist.h"
#include "msg/msg_types.h"
diff --git a/src/mon/mon_types.h b/src/mon/mon_types.h
index dc8d2089395..24d0f1cd4bd 100644
--- a/src/mon/mon_types.h
+++ b/src/mon/mon_types.h
@@ -12,8 +12,8 @@
*
*/
-#ifndef __MON_TYPES_H
-#define __MON_TYPES_H
+#ifndef CEPH_MON_TYPES_H
+#define CEPH_MON_TYPES_H
#define PAXOS_PGMAP 0 // before osd, for pg kick to behave
#define PAXOS_MDSMAP 1