From: Yehuda Sadeh <yehuda@redhat.com>
Date: Thu, 29 Jan 2015 17:28:14 +0000 (-0800)
Subject: cls_rgw: fix encoding for cls_rgw_obj
X-Git-Tag: v0.93~156^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4184387d0c59b0df6ac62492b01d302fb5710d40;p=ceph.git

cls_rgw: fix encoding for cls_rgw_obj

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/cls/rgw/cls_rgw_types.h b/src/cls/rgw/cls_rgw_types.h
index 237c45277eac9..a5f10e303d6c5 100644
--- a/src/cls/rgw/cls_rgw_types.h
+++ b/src/cls/rgw/cls_rgw_types.h
@@ -780,6 +780,7 @@ struct cls_rgw_obj {
     ::encode(pool, bl);
     ::encode(key.name, bl);
     ::encode(loc, bl);
+    ::encode(key, bl);
     ENCODE_FINISH(bl);
   }
 
@@ -789,7 +790,7 @@ struct cls_rgw_obj {
     ::decode(key.name, bl);
     ::decode(loc, bl);
     if (struct_v >= 2) {
-      ::decode(key.instance, bl);
+      ::decode(key, bl);
     }
     DECODE_FINISH(bl);
   }