]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw/rgw_common.h: fix the RGWBucketInfo decoding 8165/head
authorKefu Chai <kchai@redhat.com>
Wed, 16 Mar 2016 15:39:48 +0000 (23:39 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 16 Mar 2016 15:41:39 +0000 (23:41 +0800)
Signed-off-by: Kefu Chai <kchai@redhat.com>
src/rgw/rgw_common.h

index aa2d6415748d82c79138583387497702e7bcffc0..90d2ae5a9379edc56ded8e419127a079e0ff501f 100644 (file)
@@ -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);