From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Mon, 13 Feb 2012 20:07:17 +0000 (-0800)
Subject: rgw: remove extra useless info in bucket entry encoding
X-Git-Tag: v0.42~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9065dbd36d35b6e44c66293e74b6ba92031ca9ae;p=ceph.git

rgw: remove extra useless info in bucket entry encoding

Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
---

diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index 72fe0931af84..733d2da028d1 100644
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -610,7 +610,8 @@ struct RGWBucketEnt {
     ::encode(struct_v, bl);
     uint64_t s = size;
     __u32 mt = mtime;
-    ::encode(bucket.name, bl);
+    string empty_str;  // originally had the bucket name here, but we encode bucket later
+    ::encode(empty_str, bl);
     ::encode(s, bl);
     ::encode(mt, bl);
     ::encode(count, bl);
@@ -623,7 +624,8 @@ struct RGWBucketEnt {
     ::decode(struct_v, bl);
     __u32 mt;
     uint64_t s;
-    ::decode(bucket.name, bl);
+    string empty_str;  // backward compatibility
+    ::decode(empty_str, bl);
     ::decode(s, bl);
     ::decode(mt, bl);
     size = s;