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

messages/MOSDRepScrub: remove compat cruft

v6 was 7d73f41f0d6ae2bf971c72b0b8aca6579e1c0d62 (pre-hammer).

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

diff --git a/src/messages/MOSDRepScrub.h b/src/messages/MOSDRepScrub.h
index a1134bac39d..2f125e69591 100644
--- a/src/messages/MOSDRepScrub.h
+++ b/src/messages/MOSDRepScrub.h
@@ -25,7 +25,7 @@
 struct MOSDRepScrub : public MOSDFastDispatchOp {
 
   static const int HEAD_VERSION = 6;
-  static const int COMPAT_VERSION = 2;
+  static const int COMPAT_VERSION = 6;
 
   spg_t pgid;             // PG to scrub
   eversion_t scrub_from; // only scrub log entries after scrub_from
@@ -97,31 +97,12 @@ public:
     ::decode(scrub_from, p);
     ::decode(scrub_to, p);
     ::decode(map_epoch, p);
-
-    if (header.version >= 3) {
-      ::decode(chunky, p);
-      ::decode(start, p);
-      ::decode(end, p);
-      if (header.version >= 4) {
-        ::decode(deep, p);
-      } else {
-        deep = false;
-      }
-    } else { // v2 scrub: non-chunky
-      chunky = false;
-      deep = false;
-    }
-
-    if (header.version >= 5) {
-      ::decode(pgid.shard, p);
-    } else {
-      pgid.shard = shard_id_t::NO_SHARD;
-    }
-    if (header.version >= 6) {
-      ::decode(seed, p);
-    } else {
-      seed = 0;
-    }
+    ::decode(chunky, p);
+    ::decode(start, p);
+    ::decode(end, p);
+    ::decode(deep, p);
+    ::decode(pgid.shard, p);
+    ::decode(seed, p);
   }
 };