summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2012-01-04 13:54:45 -0800
committerSage Weil <sage@newdream.net>2012-01-04 15:57:41 -0800
commit0fb88b6f3de9507a556dddb7bf91b4e340efc17e (patch)
tree9244bdb25b774e9b7e35d39febf40f1a6c5d7afb
parent9986553c7117787bbbc1643b5d2eee9a5696eb7e (diff)
downloadceph-0fb88b6f3de9507a556dddb7bf91b4e340efc17e.tar.gz
move cluster protocol definitions out of ceph_fs.h
Among other things, we don't recompile the whole system when we touch these. Signed-off-by: Sage Weil <sage@newdream.net>
-rw-r--r--src/include/ceph_fs.h3
-rw-r--r--src/mds/MDS.h3
-rw-r--r--src/mon/Monitor.h4
-rw-r--r--src/osd/OSD.h3
4 files changed, 10 insertions, 3 deletions
diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index 8bc0b87475a..c7bc9283a99 100644
--- a/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@ -21,9 +21,6 @@
* internal cluster protocols separately from the public,
* client-facing protocol.
*/
-#define CEPH_OSD_PROTOCOL 8 /* cluster internal */
-#define CEPH_MDS_PROTOCOL 14 /* cluster internal */
-#define CEPH_MON_PROTOCOL 9 /* cluster internal */
#define CEPH_OSDC_PROTOCOL 24 /* server/client */
#define CEPH_MDSC_PROTOCOL 32 /* server/client */
#define CEPH_MONC_PROTOCOL 15 /* server/client */
diff --git a/src/mds/MDS.h b/src/mds/MDS.h
index 4ea26dec20d..5b464a0df45 100644
--- a/src/mds/MDS.h
+++ b/src/mds/MDS.h
@@ -35,6 +35,9 @@
#include "SessionMap.h"
+#define CEPH_MDS_PROTOCOL 14 /* cluster internal */
+
+
enum {
l_mds_first = 2000,
l_mds_req,
diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index e215972103c..0a7e7cad8b8 100644
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -44,6 +44,10 @@
#include <memory>
+
+#define CEPH_MON_PROTOCOL 9 /* cluster internal */
+
+
enum {
l_cluster_first = 555000,
l_cluster_num_mon,
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index c5c7b2b2e34..c5415937a7a 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -46,6 +46,9 @@ using namespace std;
using namespace __gnu_cxx;
+#define CEPH_OSD_PROTOCOL 8 /* cluster internal */
+
+
enum {
l_osd_first = 10000,
l_osd_opq,