rgw: don't encode the bucket name twice in RGWPoolInfo!

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>

diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index 12252c4314169971ab63570244c3bbc6808fb25c..fe7fc690fe013c36b73c69fa4172ba4eb9008235 100644 (file)
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -401,16 +401,16 @@ struct RGWPoolInfo
   string owner;
 
   void encode(bufferlist& bl) const {
-     __u32 ver = 2;
+     __u32 ver = 3;
      ::encode(ver, bl);
-     ::encode(bucket.name, bl);
      ::encode(owner, bl);
      ::encode(bucket, bl);
   }
   void decode(bufferlist::iterator& bl) {
      __u32 ver;
     ::decode(ver, bl);
-    ::decode(bucket.name, bl);
+    if (ver < 3)
+      ::decode(bucket.name, bl);
     ::decode(owner, bl);
     if (ver >= 2)
       ::decode(bucket, bl);