From 57ea6b67e7a4383c7ebcedc75a7bc5caaf24931d Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Tue, 27 Sep 2011 14:09:36 -0700 Subject: [PATCH] rgw: don't encode the bucket name twice in RGWPoolInfo! Signed-off-by: Greg Farnum --- src/rgw/rgw_common.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h index 12252c4314169..fe7fc690fe013 100644 --- 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); -- 2.39.5