Merge pull request #8165 from tchaikov/wip-fix-rgw-encoding

rgw/rgw_common.h: fix the RGWBucketInfo decoding

Reviewed-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Kefu Chai 2016-03-17 02:11:49 +08:00
commit eaa933877b

View 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);