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

messages/MMonScrub: drop compat cruft

v2 was 0a19fd4a2686d07cce632d20d91cf419e41dada6 (pre-infernalis).

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

diff --git a/src/messages/MMonScrub.h b/src/messages/MMonScrub.h
index 2b9d8c9c1729..b66a34d7e1d5 100644
--- a/src/messages/MMonScrub.h
+++ b/src/messages/MMonScrub.h
@@ -19,7 +19,7 @@
 class MMonScrub : public Message
 {
   static const int HEAD_VERSION = 2;
-  static const int COMPAT_VERSION = 1;
+  static const int COMPAT_VERSION = 2;
 
 public:
   typedef enum {
@@ -79,10 +79,8 @@ public:
     op = (op_type_t)o;
     ::decode(version, p);
     ::decode(result, p);
-    if (header.version >= 2) {
-      ::decode(num_keys, p);
-      ::decode(key, p);
-    }
+    ::decode(num_keys, p);
+    ::decode(key, p);
   }
 };