From: Sage Weil <sage@redhat.com>
Date: Wed, 12 Apr 2017 13:20:31 +0000 (-0400)
Subject: osd/osd_types: remove pg_notify_t compat cruft
X-Git-Tag: v12.0.3~190^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=401b58c06eaf72e08bff63916b7d174ef2d4dda3;p=ceph.git

osd/osd_types: remove pg_notify_t compat cruft

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

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 922d48c6ddd..e87c4cacc7a 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -2933,7 +2933,7 @@ void pg_info_t::generate_test_instances(list<pg_info_t*>& o)
 // -- pg_notify_t --
 void pg_notify_t::encode(bufferlist &bl) const
 {
-  ENCODE_START(2, 1, bl);
+  ENCODE_START(2, 2, bl);
   ::encode(query_epoch, bl);
   ::encode(epoch_sent, bl);
   ::encode(info, bl);
@@ -2948,13 +2948,8 @@ void pg_notify_t::decode(bufferlist::iterator &bl)
   ::decode(query_epoch, bl);
   ::decode(epoch_sent, bl);
   ::decode(info, bl);
-  if (struct_v >= 2) {
-    ::decode(to, bl);
-    ::decode(from, bl);
-  } else {
-    to = shard_id_t::NO_SHARD;
-    from = shard_id_t::NO_SHARD;
-  }
+  ::decode(to, bl);
+  ::decode(from, bl);
   DECODE_FINISH(bl);
 }