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-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=052e15979bfbb69d1cd4d03fd90c8c5b104194c9;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>
(cherry picked from commit 2b7ddde685213f3908f2dd9545b35f1d97f35a79)

Conflicts:
	src/osd/osd_types.cc
            In firefly we need 14 to match object_info_t::encode(), whereas
            in hammer and master the right value is 15.
---

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 5f4d660b5da55..06dff212cfcce 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -3796,7 +3796,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(13, 8, 8, bl);
+  DECODE_START_LEGACY_COMPAT_LEN(14, 8, 8, bl);
   map<entity_name_t, watch_info_t> old_watchers;
   if (struct_v >= 2 && struct_v <= 5) {
     sobject_t obj;