]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/osd_types: fix object_stat_sum_t decode 22253/head
authorSage Weil <sage@redhat.com>
Thu, 26 Oct 2017 02:39:23 +0000 (21:39 -0500)
committerJosh Durgin <jdurgin@redhat.com>
Fri, 25 May 2018 21:22:00 +0000 (17:22 -0400)
Broken by 71bf04775bef90c9291bd825da626bc9de6f9ec1

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 68f38a0544349a09100484c17a0d1d4d348d0146)

src/osd/osd_types.cc

index 8928fb93dbfab41e9ed27d240dcf339a586aac01..5bbfe3985a41b5f36b1f792f8c594f7f7b2a828e 100644 (file)
@@ -1998,9 +1998,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;
   }