From 8d9b65ec5abf61c3b69c2d15e82a494a747089be Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 11 Apr 2017 22:56:27 -0400 Subject: [PATCH] messages/MOSDPGPull: remove compat cruft v2 is 8b46dd1dc009981f2fcae7b0e05155e81841c4a5 (pre-firefly). Signed-off-by: Sage Weil --- src/messages/MOSDPGPull.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/messages/MOSDPGPull.h b/src/messages/MOSDPGPull.h index df9c110f32f..442836e3da2 100644 --- 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 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 { -- 2.39.5