From: Sage Weil <sage@redhat.com>
Date: Thu, 26 Oct 2017 02:39:23 +0000 (-0500)
Subject: osd/osd_types: fix object_stat_sum_t decode
X-Git-Tag: v13.0.1~392^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F18551%2Fhead;p=ceph.git

osd/osd_types: fix object_stat_sum_t decode

Broken by 71bf04775bef90c9291bd825da626bc9de6f9ec1

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

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 40427d0a1a21..28672a44f6d1 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -1990,9 +1990,9 @@ void object_stat_sum_t::encode(bufferlist& bl) const
 void object_stat_sum_t::decode(bufferlist::iterator& bl)
 {
   bool decode_finish = false;
-  DECODE_START(17, bl);
+  DECODE_START(17, bl);  // make sure to also update fast decode below
 #if defined(CEPH_LITTLE_ENDIAN)
-  if (struct_v >= 16) {
+  if (struct_v >= 17) {  // this must match newest decode version
     bl.copy(sizeof(object_stat_sum_t), (char*)(&num_bytes));
     decode_finish = true;
   }