From: Samuel Just <sam.just@inktank.com>
Date: Mon, 7 Apr 2014 23:40:09 +0000 (-0700)
Subject: osd_types: fix pg_stat_t::encode, object_stat_sum_t::decode version
X-Git-Tag: v0.80-rc1~86
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=010dff12c38882238591bb042f8e497a1f7ba020;p=ceph.git

osd_types: fix pg_stat_t::encode, object_stat_sum_t::decode version

Introduced in a130a4452e4fb159dc62fb417077d98dc9ebd621
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 4b69acd7b33b..dca7bbf605f3 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -1341,7 +1341,7 @@ void object_stat_sum_t::encode(bufferlist& bl) const
 
 void object_stat_sum_t::decode(bufferlist::iterator& bl)
 {
-  DECODE_START_LEGACY_COMPAT_LEN(7, 3, 3, bl);
+  DECODE_START_LEGACY_COMPAT_LEN(8, 3, 3, bl);
   ::decode(num_bytes, bl);
   if (struct_v < 3) {
     uint64_t num_kb;
@@ -1571,7 +1571,7 @@ void pg_stat_t::dump_brief(Formatter *f) const
 
 void pg_stat_t::encode(bufferlist &bl) const
 {
-  ENCODE_START(15, 8, bl);
+  ENCODE_START(16, 8, bl);
   ::encode(version, bl);
   ::encode(reported_seq, bl);
   ::encode(reported_epoch, bl);