From 7ffee79b6921de81567ced29bd452cb56f45c758 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 12 Apr 2017 08:02:42 -0400 Subject: [PATCH] messages/MRoute: remove compat cruft v3 was 39e06ef8f070e136e54452bdea3f6105cd79bb73 (pre-jewel). Signed-off-by: Sage Weil --- src/messages/MRoute.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/messages/MRoute.h b/src/messages/MRoute.h index 053d2768f26..179cf598597 100644 --- a/src/messages/MRoute.h +++ b/src/messages/MRoute.h @@ -23,7 +23,7 @@ struct MRoute : public Message { static const int HEAD_VERSION = 3; - static const int COMPAT_VERSION = 2; + static const int COMPAT_VERSION = 3; uint64_t session_mon_tid; Message *msg; @@ -58,17 +58,11 @@ public: bufferlist::iterator p = payload.begin(); ::decode(session_mon_tid, p); ::decode(dest, p); - if (header.version >= 2) { - bool m; - ::decode(m, p); - if (m) - msg = decode_message(NULL, 0, p); - } else { + bool m; + ::decode(m, p); + if (m) msg = decode_message(NULL, 0, p); - } - if (header.version >= 3) { - ::decode(send_osdmap_first, p); - } + ::decode(send_osdmap_first, p); } void encode_payload(uint64_t features) override { ::encode(session_mon_tid, payload); -- 2.39.5