From: Sage Weil <sage@inktank.com>
Date: Thu, 10 Jul 2014 17:36:16 +0000 (-0700)
Subject: rgw: fix RGWObjManifestRule decoder
X-Git-Tag: v0.83~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c4afaf9dabd261853a44b2e08f0911c075c1cd3a;p=ceph.git

rgw: fix RGWObjManifestRule decoder

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>
---

diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h
index f00e21579d8d..dc023c26cbed 100644
--- a/src/rgw/rgw_rados.h
+++ b/src/rgw/rgw_rados.h
@@ -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;