From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Tue, 27 Aug 2019 08:09:14 +0000 (+0800)
Subject: osd/osd_types: bump up some encoding versions
X-Git-Tag: v15.1.0~1708^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e61fcd6bfb58fdb91a34ed1d9e08d3a21b136606;p=ceph.git

osd/osd_types: bump up some encoding versions

it does not really pose a problem for now since we only check it
against the compat version, but it's good to keep it up to date.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index e2bcb31e314f..e908e054f022 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -4469,7 +4469,7 @@ void pg_log_entry_t::encode(ceph::buffer::list &bl) const
 
 void pg_log_entry_t::decode(ceph::buffer::list::const_iterator &bl)
 {
-  DECODE_START_LEGACY_COMPAT_LEN(12, 4, 4, bl);
+  DECODE_START_LEGACY_COMPAT_LEN(13, 4, 4, bl);
   decode(op, bl);
   if (struct_v < 2) {
     sobject_t old_soid;
@@ -4526,7 +4526,7 @@ void pg_log_entry_t::decode(ceph::buffer::list::const_iterator &bl)
   if (struct_v >= 12 && !extra_reqids.empty())
     decode(extra_reqid_return_codes, bl);
   if (struct_v >= 13)
-    ::decode(clean_regions, bl);
+    decode(clean_regions, bl);
   else
     clean_regions.mark_fully_dirty();
   DECODE_FINISH(bl);
@@ -4957,7 +4957,7 @@ void object_copy_data_t::encode(ceph::buffer::list& bl, uint64_t features) const
 
 void object_copy_data_t::decode(ceph::buffer::list::const_iterator& bl)
 {
-  DECODE_START(7, bl);
+  DECODE_START(8, bl);
   if (struct_v < 5) {
     // old
     decode(size, bl);