]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/AuthMonitor: drop ancient auth inc encoding compat
authorSage Weil <sage@redhat.com>
Sun, 12 Aug 2018 17:43:26 +0000 (12:43 -0500)
committerSage Weil <sage@redhat.com>
Fri, 31 Aug 2018 14:27:36 +0000 (09:27 -0500)
This is for *ancient* mons (I'm guessing bobtail?).

Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/AuthMonitor.h

index 4e22da1f782c1c586120d757e73f3945988c7f72..4b6812428b6e503017bc96321422fafb8f8764f8 100644 (file)
@@ -48,19 +48,6 @@ public:
 
     void encode(bufferlist& bl, uint64_t features=-1) const {
       using ceph::encode;
-      if ((features & CEPH_FEATURE_MONENC) == 0) {
-       __u8 v = 1;
-       encode(v, bl);
-       __u32 _type = (__u32)inc_type;
-       encode(_type, bl);
-       if (_type == GLOBAL_ID) {
-         encode(max_global_id, bl);
-       } else {
-         encode(auth_type, bl);
-         encode(auth_data, bl);
-       }
-       return;
-      } 
       ENCODE_START(2, 2, bl);
       __u32 _type = (__u32)inc_type;
       encode(_type, bl);