]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/osd_types: fix object_stat_sum_t decode 18551/head
authorSage Weil <sage@redhat.com>
Thu, 26 Oct 2017 02:39:23 +0000 (21:39 -0500)
committerSage Weil <sage@redhat.com>
Thu, 26 Oct 2017 02:39:23 +0000 (21:39 -0500)
Broken by 71bf04775bef90c9291bd825da626bc9de6f9ec1

Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/osd_types.cc

index 40427d0a1a2144ebe9a0355dbc2df57c87a4877e..28672a44f6d115c000293e74b0d97ee9d96256ce 100644 (file)
@@ -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;
   }