From: Sage Weil <sage@redhat.com>
Date: Wed, 12 Apr 2017 02:43:38 +0000 (-0400)
Subject: messages/MMonElection: drop old compat cruft
X-Git-Tag: v12.0.3~190^2~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bc96fe9685e087783a677150cba9f9d923694706;p=ceph.git

messages/MMonElection: drop old compat cruft

v5 was 8025fb33add620cb89f795281067c5bddf0467b5 (pre-firefly); v6 was
34b4ad730bfb5a90760705553415582ac01a4312 (pre-kraken).

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/messages/MMonElection.h b/src/messages/MMonElection.h
index 89f10a81a2b2..79503875e264 100644
--- a/src/messages/MMonElection.h
+++ b/src/messages/MMonElection.h
@@ -23,7 +23,7 @@
 class MMonElection : public Message {
 
   static const int HEAD_VERSION = 6;
-  static const int COMPAT_VERSION = 2;
+  static const int COMPAT_VERSION = 5;
 
 public:
   static const int OP_PROPOSE = 1;
@@ -103,24 +103,15 @@ public:
   }
   void decode_payload() override {
     bufferlist::iterator p = payload.begin();
-    if (header.version >= 2)
-      ::decode(fsid, p);
-    else
-      memset(&fsid, 0, sizeof(fsid));
+    ::decode(fsid, p);
     ::decode(op, p);
     ::decode(epoch, p);
     ::decode(monmap_bl, p);
     ::decode(quorum, p);
-    if (header.version >= 3)
-      ::decode(quorum_features, p);
-    else
-      quorum_features = 0;
-    if (header.version >= 4) {
-      ::decode(defunct_one, p);
-      ::decode(defunct_two, p);
-    }
-    if (header.version >= 5)
-      ::decode(sharing_bl, p);
+    ::decode(quorum_features, p);
+    ::decode(defunct_one, p);
+    ::decode(defunct_two, p);
+    ::decode(sharing_bl, p);
     if (header.version >= 6)
       ::decode(mon_features, p);
   }