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

message/MForward: drop compat cruft

v3 was 87734747dca113d6a13d1e78da52e6009a9e935a (pre-hammer).

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

diff --git a/src/messages/MForward.h b/src/messages/MForward.h
index 5f464a1bb691..333475e46621 100644
--- a/src/messages/MForward.h
+++ b/src/messages/MForward.h
@@ -35,7 +35,7 @@ struct MForward : public Message {
   string msg_desc;  // for operator<< only
   
   static const int HEAD_VERSION = 3;
-  static const int COMPAT_VERSION = 1;
+  static const int COMPAT_VERSION = 3;
 
   MForward() : Message(MSG_FORWARD, HEAD_VERSION, COMPAT_VERSION),
                tid(0), con_features(0), msg(NULL) {}
@@ -91,20 +91,8 @@ public:
     ::decode(client, p);
     ::decode(client_caps, p);
     msg = (PaxosServiceMessage *)decode_message(NULL, 0, p);
-    if (header.version >= 2) {
-      ::decode(con_features, p);
-    } else {
-      con_features = 0;
-    }
-    if (header.version >= 3) {
-      ::decode(entity_name, p);
-    } else {
-      // we are able to know the entity type, obtaining it from the
-      // entity_name_t on 'client', but we have no idea about the
-      // entity name, so we'll just use a friendly '?' instead.
-      entity_name.set(client.name.type(), "?");
-    }
-
+    ::decode(con_features, p);
+    ::decode(entity_name, p);
   }
 
   PaxosServiceMessage *claim_message() {