import ceph quincy 17.2.6

[ceph.git] / ceph / src / rgw / rgw_zone.cc

diff --git a/ceph/src/rgw/rgw_zone.cc b/ceph/src/rgw/rgw_zone.cc
index c8e8d09b8879a66adb8548e56b5138fa8627db8c..bbeea7efb84e1e1ad39c1d361e412e697de48466 100644 (file)
--- a/ceph/src/rgw/rgw_zone.cc
+++ b/ceph/src/rgw/rgw_zone.cc
@@ -2607,6 +2607,7 @@ void RGWZonePlacementInfo::dump(Formatter *f) const
   encode_json("storage_classes", storage_classes, f);
   encode_json("data_extra_pool", data_extra_pool, f);
   encode_json("index_type", (uint32_t)index_type, f);
+  encode_json("inline_data", inline_data, f);
 
   /* no real need for backward compatibility of compression_type and data_pool in here,
    * rather not clutter the output */
@@ -2619,6 +2620,7 @@ void RGWZonePlacementInfo::decode_json(JSONObj *obj)
   JSONDecoder::decode_json("data_extra_pool", data_extra_pool, obj);
   uint32_t it;
   JSONDecoder::decode_json("index_type", it, obj);
+  JSONDecoder::decode_json("inline_data", inline_data, obj);
   index_type = (rgw::BucketIndexType)it;
 
   /* backward compatibility, these are now defined in storage_classes */