msgr: Remove the type CEPH_ENTITY_TYPE_ADMIN.

It *looks* like this won't break EntityName's isAdmin() function as that
depends on a set name, and client.admin will satisfy it. I think.

diff --git a/src/ceph.cc b/src/ceph.cc
index c533016515ac4a9bb5db18cb7c1cd3ab45b4dfb4..fb0741aff45236f247175b00dd003a5d0237b6cc 100644 (file)
--- a/src/ceph.cc
+++ b/src/ceph.cc
@@ -627,7 +627,7 @@ int main(int argc, const char **argv, const char *envp[])
   
   // start up network
   SimpleMessenger *messenger = new SimpleMessenger();
-  messenger->register_entity(entity_name_t::ADMIN());
+  messenger->register_entity(entity_name_t::CLIENT());
   messenger->add_dispatcher_head(&dispatcher);
 
   messenger->start();

diff --git a/src/dumpjournal.cc b/src/dumpjournal.cc
index cc245c0f1000a7f45a38cd600d452fa6e7b3dde2..d30fa60a044e7bfe36d728c90b4e08d5b21efdf2 100644 (file)
--- a/src/dumpjournal.cc
+++ b/src/dumpjournal.cc
@@ -93,7 +93,7 @@ int main(int argc, const char **argv, const char *envp[])
   messenger->bind();
   g_conf.daemonize = false; // not us!
   messenger->start();
-  messenger->register_entity(entity_name_t::ADMIN());
+  messenger->register_entity(entity_name_t::CLIENT());
   messenger->add_dispatcher_head(&dispatcher);
 
   inodeno_t ino = MDS_INO_LOG_OFFSET + mds;

diff --git a/src/include/ceph_strings.cc b/src/include/ceph_strings.cc
index 8e4be6a80c62a0466c3758a25e5367493f54bd77..76b11b54e1e8d74e6e4a9c11f01b4e27e8aac841 100644 (file)
--- a/src/include/ceph_strings.cc
+++ b/src/include/ceph_strings.cc
@@ -10,7 +10,6 @@ const char *ceph_entity_type_name(int type)
        case CEPH_ENTITY_TYPE_OSD: return "osd";
        case CEPH_ENTITY_TYPE_MON: return "mon";
        case CEPH_ENTITY_TYPE_CLIENT: return "client";
-       case CEPH_ENTITY_TYPE_ADMIN: return "admin";
        case CEPH_ENTITY_TYPE_AUTH: return "auth";
        default: return "unknown";
        }

diff --git a/src/include/msgr.h b/src/include/msgr.h
index 8aaab414f3f8ab84dae8d08cbe7161f9fa425eed..5e576d087f4624d27650cd9d7f15d0ded600495d 100644 (file)
--- a/src/include/msgr.h
+++ b/src/include/msgr.h
@@ -50,8 +50,7 @@ struct ceph_entity_name {
 #define CEPH_ENTITY_TYPE_MDS    0x02
 #define CEPH_ENTITY_TYPE_OSD    0x04
 #define CEPH_ENTITY_TYPE_CLIENT 0x08
-#define CEPH_ENTITY_TYPE_ADMIN  0x10
-#define CEPH_ENTITY_TYPE_AUTH   0x20
+#define CEPH_ENTITY_TYPE_AUTH   0x10
 
 #define CEPH_ENTITY_TYPE_ANY    0xFF
 

diff --git a/src/msg/msg_types.h b/src/msg/msg_types.h
index 41711c733bcf7d76568a7bebb936e871785ee4a0..584692564f3d1ad3ea1f50a6a6444ff470f816da 100644 (file)
--- a/src/msg/msg_types.h
+++ b/src/msg/msg_types.h
@@ -30,7 +30,6 @@ public:
   static const int TYPE_MDS = CEPH_ENTITY_TYPE_MDS;
   static const int TYPE_OSD = CEPH_ENTITY_TYPE_OSD;
   static const int TYPE_CLIENT = CEPH_ENTITY_TYPE_CLIENT;
-  static const int TYPE_ADMIN = CEPH_ENTITY_TYPE_ADMIN;
 
   static const int NEW = -1;
 
@@ -45,7 +44,6 @@ public:
   static entity_name_t MDS(int i=NEW) { return entity_name_t(TYPE_MDS, i); }
   static entity_name_t OSD(int i=NEW) { return entity_name_t(TYPE_OSD, i); }
   static entity_name_t CLIENT(int i=NEW) { return entity_name_t(TYPE_CLIENT, i); }
-  static entity_name_t ADMIN(int i=NEW) { return entity_name_t(TYPE_ADMIN, i); }
   
   __s64 num() const { return _num; }
   int type() const { return _type; }
@@ -59,7 +57,6 @@ public:
   bool is_mds() const { return type() == TYPE_MDS; }
   bool is_osd() const { return type() == TYPE_OSD; }
   bool is_mon() const { return type() == TYPE_MON; }
-  bool is_admin() const { return type() == TYPE_ADMIN; }
 
   operator ceph_entity_name() const {
     ceph_entity_name n = { _type, init_le64(_num) };

diff --git a/wireshark/ceph/msgr.h b/wireshark/ceph/msgr.h
index 9abc879e25b1b3f3f3b27c5000a6abaaac5523d0..f1d10417471cd0fd0d260f72cf2a0ed23fea65cb 100644 (file)
--- a/wireshark/ceph/msgr.h
+++ b/wireshark/ceph/msgr.h
@@ -50,7 +50,6 @@ struct ceph_entity_name {
 #define CEPH_ENTITY_TYPE_MDS    2
 #define CEPH_ENTITY_TYPE_OSD    3
 #define CEPH_ENTITY_TYPE_CLIENT 4
-#define CEPH_ENTITY_TYPE_ADMIN  5
 
 /*
  * entity_addr -- network address