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

messages/MOSDPing: remove compat cruft

v2 was 4e2f0d149d9bb9310dde12c201417d7747c52a85 (pre-argonaut).

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

diff --git a/src/messages/MOSDPing.h b/src/messages/MOSDPing.h
index ce75ad848572..3bb54c5ae0ff 100644
--- a/src/messages/MOSDPing.h
+++ b/src/messages/MOSDPing.h
@@ -24,7 +24,7 @@
 class MOSDPing : public Message {
 
   static const int HEAD_VERSION = 2;
-  static const int COMPAT_VERSION = 1;
+  static const int COMPAT_VERSION = 2;
 
  public:
   enum {
@@ -71,8 +71,7 @@ public:
     ::decode(peer_as_of_epoch, p);
     ::decode(op, p);
     ::decode(peer_stat, p);
-    if (header.version >= 2)
-      ::decode(stamp, p);
+    ::decode(stamp, p);
   }
   void encode_payload(uint64_t features) override {
     ::encode(fsid, payload);