]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: Correct the object_info_t::decode() version 6335/head
authorDavid Zafman <dzafman@redhat.com>
Mon, 12 Oct 2015 20:24:31 +0000 (13:24 -0700)
committerAbhishek Varshney <abhishek.varshney@flipkart.com>
Wed, 21 Oct 2015 11:38:12 +0000 (17:08 +0530)
Caused by: 13b9dc70

Fixes: #13462
Backport: Hammer, Firefly

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 2b7ddde685213f3908f2dd9545b35f1d97f35a79)

src/osd/osd_types.cc

index b2bea5b7204e4b93c48256c2039e823e0333bb4b..94ca0832313efc2f288b77b93c6cbf09174bf27b 100644 (file)
@@ -4259,7 +4259,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);