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

messages/MOSDBoot: drop compat cruft

v6 was bee91548b07c6a28314dddc50fef8b6a2677e774 (pre-hammer).

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

diff --git a/src/messages/MOSDBoot.h b/src/messages/MOSDBoot.h
index 72f126ec0aa..66f5bf079b6 100644
--- a/src/messages/MOSDBoot.h
+++ b/src/messages/MOSDBoot.h
@@ -23,7 +23,7 @@
 class MOSDBoot : public PaxosServiceMessage {
 
   static const int HEAD_VERSION = 6;
-  static const int COMPAT_VERSION = 2;
+  static const int COMPAT_VERSION = 6;
 
  public:
   OSDSuperblock sb;
@@ -77,18 +77,11 @@ public:
     paxos_decode(p);
     ::decode(sb, p);
     ::decode(hb_back_addr, p);
-    if (header.version >= 2)
-      ::decode(cluster_addr, p);
-    if (header.version >= 3)
-      ::decode(boot_epoch, p);
-    if (header.version >= 4)
-      ::decode(hb_front_addr, p);
-    if (header.version >= 5)
-      ::decode(metadata, p);
-    if (header.version >= 6)
-      ::decode(osd_features, p);
-    else
-      osd_features = 0;
+    ::decode(cluster_addr, p);
+    ::decode(boot_epoch, p);
+    ::decode(hb_front_addr, p);
+    ::decode(metadata, p);
+    ::decode(osd_features, p);
   }
 };