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

messages/MBackfilLReserve: drop compat cruft

v3 was 8b46dd1dc009981f2fcae7b0e05155e81841c4a5 (pre-firefly).

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

diff --git a/src/messages/MBackfillReserve.h b/src/messages/MBackfillReserve.h
index 41f33557a183..f70c2946b30e 100644
--- a/src/messages/MBackfillReserve.h
+++ b/src/messages/MBackfillReserve.h
@@ -19,7 +19,7 @@
 
 class MBackfillReserve : public Message {
   static const int HEAD_VERSION = 3;
-  static const int COMPAT_VERSION = 1;
+  static const int COMPAT_VERSION = 3;
 public:
   spg_t pgid;
   epoch_t query_epoch;
@@ -68,15 +68,8 @@ public:
     ::decode(pgid.pgid, p);
     ::decode(query_epoch, p);
     ::decode(type, p);
-    if (header.version > 1)
-      ::decode(priority, p);
-    else
-      priority = 0;
-    if (header.version >= 3)
-      ::decode(pgid.shard, p);
-    else
-      pgid.shard = shard_id_t::NO_SHARD;
-
+    ::decode(priority, p);
+    ::decode(pgid.shard, p);
   }
 
   void encode_payload(uint64_t features) override {