]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix RGWObjManifestRule decoder
authorSage Weil <sage@inktank.com>
Thu, 10 Jul 2014 17:36:16 +0000 (10:36 -0700)
committerSage Weil <sage@inktank.com>
Thu, 10 Jul 2014 17:36:37 +0000 (10:36 -0700)
Only decode the new field if it is a new struct.

Fixes: #8804
Backport: firefly
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
src/rgw/rgw_rados.h

index f00e21579d8d88181145e91d1d358177da22209d..dc023c26cbedbc10a23cb20db43963cc2babe417 100644 (file)
@@ -162,7 +162,8 @@ struct RGWObjManifestRule {
     ::decode(start_ofs, bl);
     ::decode(part_size, bl);
     ::decode(stripe_max_size, bl);
-    ::decode(override_prefix, bl);
+    if (struct_v >= 2)
+      ::decode(override_prefix, bl);
     DECODE_FINISH(bl);
   }
   void dump(Formatter *f) const;