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

messages/MOSDPGTrim: remove compat cruft

v2 was 8b46dd1dc009981f2fcae7b0e05155e81841c4a5 (pre-firefly)

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

diff --git a/src/messages/MOSDPGTrim.h b/src/messages/MOSDPGTrim.h
index 175579e1e3e8..030da7c2c8dc 100644
--- a/src/messages/MOSDPGTrim.h
+++ b/src/messages/MOSDPGTrim.h
@@ -20,7 +20,7 @@
 class MOSDPGTrim : public Message {
 
   static const int HEAD_VERSION = 2;
-  static const int COMPAT_VERSION = 1;
+  static const int COMPAT_VERSION = 2;
 
 public:
   epoch_t epoch;
@@ -53,10 +53,7 @@ public:
     ::decode(epoch, p);
     ::decode(pgid.pgid, p);
     ::decode(trim_to, p);
-    if (header.version >= 2)
-      ::decode(pgid.shard, p);
-    else
-      pgid.shard = shard_id_t::NO_SHARD;
+    ::decode(pgid.shard, p);
   }
 };