From: David Zafman <dzafman@redhat.com>
Date: Mon, 12 Oct 2015 20:24:31 +0000 (-0700)
Subject: osd: Correct the object_info_t::decode() version
X-Git-Tag: v9.2.0~19^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F6235%2Fhead;p=ceph.git

osd: Correct the object_info_t::decode() version

Caused by: 13b9dc70

Fixes: #13462
Backport: Hammer, Firefly

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index a56ed5562008..10458eca1080 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -4449,7 +4449,7 @@ void object_info_t::encode(bufferlist& bl) const
 void object_info_t::decode(bufferlist::iterator& bl)
 {
   object_locator_t myoloc;
-  DECODE_START_LEGACY_COMPAT_LEN(14, 8, 8, bl);
+  DECODE_START_LEGACY_COMPAT_LEN(15, 8, 8, bl);
   map<entity_name_t, watch_info_t> old_watchers;
   ::decode(soid, bl);
   ::decode(myoloc, bl);