From f2ea58d4047b2b5924b13c16932eb7a4e27d6a92 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 11 Apr 2017 22:47:26 -0400 Subject: [PATCH] messages/MMonScrub: drop compat cruft v2 was 0a19fd4a2686d07cce632d20d91cf419e41dada6 (pre-infernalis). Signed-off-by: Sage Weil --- src/messages/MMonScrub.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/messages/MMonScrub.h b/src/messages/MMonScrub.h index 2b9d8c9c172..b66a34d7e1d 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); } }; -- 2.39.5