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

messages/MOSDPGScan: remove compat cruft

v2 was 8b46dd1dc009981f2fcae7b0e05155e81841c4a5 (pre-firefly)

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

diff --git a/src/messages/MOSDPGScan.h b/src/messages/MOSDPGScan.h
index 49f85ed2349..e5c25caaa57 100644
--- a/src/messages/MOSDPGScan.h
+++ b/src/messages/MOSDPGScan.h
@@ -20,7 +20,7 @@
 class MOSDPGScan : public MOSDFastDispatchOp {
 
   static const int HEAD_VERSION = 2;
-  static const int COMPAT_VERSION = 1;
+  static const int COMPAT_VERSION = 2;
 
 public:
   enum {
@@ -63,15 +63,8 @@ public:
     if (!end.is_max() && end.pool == -1)
       end.pool = pgid.pool();
 
-    if (header.version >= 2) {
-      ::decode(from, p);
-      ::decode(pgid.shard, p);
-    } else {
-      from = pg_shard_t(
-	get_source().num(),
-	shard_id_t::NO_SHARD);
-      pgid.shard = shard_id_t::NO_SHARD;
-    }
+    ::decode(from, p);
+    ::decode(pgid.shard, p);
   }
 
   void encode_payload(uint64_t features) override {