From: Yehuda Sadeh <yehuda@inktank.com>
Date: Wed, 15 May 2013 01:26:37 +0000 (-0700)
Subject: rgw: add region to bucket info
X-Git-Tag: v0.67-rc1~128^2~116
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c8ac2879fa006a1fd9eae1aacf6501243fe19ab2;p=ceph.git

rgw: add region to bucket info

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

diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index 1d4659371a6c..465d58e9a574 100644
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -566,21 +566,25 @@ struct RGWBucketInfo
   rgw_bucket bucket;
   string owner;
   uint32_t flags;
+  string region;
 
   void encode(bufferlist& bl) const {
-     ENCODE_START(4, 4, bl);
+     ENCODE_START(5, 4, bl);
      ::encode(bucket, bl);
      ::encode(owner, bl);
      ::encode(flags, bl);
+     ::encode(region, bl);
      ENCODE_FINISH(bl);
   }
   void decode(bufferlist::iterator& bl) {
-    DECODE_START_LEGACY_COMPAT_LEN_32(4, 4, 4, bl);
+    DECODE_START_LEGACY_COMPAT_LEN_32(5, 4, 4, bl);
      ::decode(bucket, bl);
      if (struct_v >= 2)
        ::decode(owner, bl);
      if (struct_v >= 3)
        ::decode(flags, bl);
+     if (struct_v >= 5)
+       ::decode(region, bl);
      DECODE_FINISH(bl);
   }
   void dump(Formatter *f) const;