From: Kefu Chai <kchai@redhat.com>
Date: Wed, 16 Mar 2016 15:39:48 +0000 (+0800)
Subject: rgw/rgw_common.h: fix the RGWBucketInfo decoding
X-Git-Tag: v10.1.0~61^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8165%2Fhead;p=ceph.git

rgw/rgw_common.h: fix the RGWBucketInfo decoding

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index aa2d6415748d..90d2ae5a9379 100644
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -935,10 +935,11 @@ struct RGWBucketInfo
        ::decode(flags, bl);
      if (struct_v >= 5)
        ::decode(zonegroup, bl);
-     if (struct_v >= 6 && struct_v < 17) {
+     if (struct_v >= 6) {
        uint64_t ct;
        ::decode(ct, bl);
-       creation_time = ceph::real_clock::from_time_t((time_t)ct);
+       if (struct_v < 17)
+	 creation_time = ceph::real_clock::from_time_t((time_t)ct);
      }
      if (struct_v >= 7)
        ::decode(placement_rule, bl);