]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: Correct the object_info_t::decode() version 6234/head 6235/head
authorDavid Zafman <dzafman@redhat.com>
Mon, 12 Oct 2015 20:24:31 +0000 (13:24 -0700)
committerDavid Zafman <dzafman@redhat.com>
Mon, 12 Oct 2015 21:03:24 +0000 (14:03 -0700)
Caused by: 13b9dc70

Fixes: #13462
Backport: Hammer, Firefly

Signed-off-by: David Zafman <dzafman@redhat.com>
src/osd/osd_types.cc

index a56ed5562008de483acb3b5fbbdc2f0d91cd5758..10458eca1080072373967ff146ac8164320a321c 100644 (file)
@@ -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);