messages/MOSDPGPull: remove compat cruft

v2 is 8b46dd1dc009981f2fcae7b0e05155e81841c4a5 (pre-firefly).

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

diff --git a/src/messages/MOSDPGPull.h b/src/messages/MOSDPGPull.h
index df9c110f32fb41a73ff85bcf032ff291768a909a..442836e3da2063f01012d55d9c2afb63cf818cfd 100644 (file)
--- a/src/messages/MOSDPGPull.h
+++ b/src/messages/MOSDPGPull.h
@@ -19,7 +19,7 @@
 
 class MOSDPGPull : public MOSDFastDispatchOp {
   static const int HEAD_VERSION = 2;
-  static const int COMPAT_VERSION = 1;
+  static const int COMPAT_VERSION = 2;
 
   vector<PullOp> pulls;
 
@@ -67,13 +67,8 @@ public:
     ::decode(map_epoch, p);
     ::decode(pulls, p);
     ::decode(cost, p);
-    if (header.version >= 2) {
-      ::decode(pgid.shard, p);
-      ::decode(from, p);
-    } else {
-      pgid.shard = shard_id_t::NO_SHARD;
-      from = pg_shard_t(get_source().num(), shard_id_t::NO_SHARD);
-    }
+    ::decode(pgid.shard, p);
+    ::decode(from, p);
   }
 
   void encode_payload(uint64_t features) override {