update ceph source to reef 18.1.2

[ceph.git] / ceph / src / tools / ceph-dencoder / rgw_types.h

diff --git a/ceph/src/tools/ceph-dencoder/rgw_types.h b/ceph/src/tools/ceph-dencoder/rgw_types.h
index 8862774e7dd17bbb3499bf1016ec7be9de8f7e64..dd5c3a8cb7f18180bfbe1f2f0034055fd96a7d2a 100644 (file)
--- a/ceph/src/tools/ceph-dencoder/rgw_types.h
+++ b/ceph/src/tools/ceph-dencoder/rgw_types.h
@@ -1,12 +1,12 @@
 #ifdef WITH_RADOSGW
 
-#include "rgw/rgw_rados.h"
+#include "rgw_rados.h"
 TYPE(RGWOLHInfo)
 TYPE(RGWObjManifestPart)
 TYPE(RGWObjManifest)
 TYPE(objexp_hint_entry)
 
-#include "rgw/rgw_zone.h"
+#include "rgw_zone.h"
 TYPE(RGWZoneParams)
 TYPE(RGWZone)
 TYPE(RGWZoneGroup)
@@ -14,7 +14,7 @@ TYPE(RGWRealm)
 TYPE(RGWPeriod)
 TYPE(RGWPeriodLatestEpochInfo)
 
-#include "rgw/rgw_acl.h"
+#include "rgw_acl.h"
 TYPE(ACLPermission)
 TYPE(ACLGranteeType)
 TYPE(ACLGrant)
@@ -22,12 +22,12 @@ TYPE(RGWAccessControlList)
 TYPE(ACLOwner)
 TYPE(RGWAccessControlPolicy)
 
-#include "rgw/rgw_cache.h"
+#include "rgw_cache.h"
 TYPE(ObjectMetaInfo)
 TYPE(ObjectCacheInfo)
 TYPE(RGWCacheNotifyInfo)
 
-#include "rgw/rgw_lc.h"
+#include "rgw_lc.h"
 TYPE(RGWLifecycleConfiguration)
 
 #include "cls/rgw/cls_rgw_types.h"
@@ -42,8 +42,15 @@ TYPE(rgw_bucket_entry_ver)
 TYPE(cls_rgw_obj_key)
 TYPE(rgw_bucket_olh_log_entry)
 TYPE(rgw_usage_log_entry)
+TYPE(rgw_cls_bi_entry)
+TYPE(rgw_bucket_olh_entry)
+TYPE(rgw_usage_data)
+TYPE(rgw_usage_log_info)
+TYPE(rgw_user_bucket)
+TYPE(cls_rgw_lc_entry)
 
 #include "cls/rgw/cls_rgw_ops.h"
+TYPE(cls_rgw_lc_get_entry_ret)
 TYPE(rgw_cls_obj_prepare_op)
 TYPE(rgw_cls_obj_complete_op)
 TYPE(rgw_cls_list_op)
@@ -103,7 +110,7 @@ TYPE(cls::journal::ObjectSetPosition)
 TYPE(cls::journal::Client)
 TYPE(cls::journal::Tag)
 
-#include "rgw/rgw_common.h"
+#include "rgw_common.h"
 TYPE(RGWAccessKey)
 TYPE(RGWSubUser)
 TYPE(RGWUserInfo)
@@ -112,23 +119,23 @@ TYPE(RGWBucketInfo)
 TYPE(RGWBucketEnt)
 TYPE(rgw_obj)
 
-#include "rgw/rgw_log.h"
+#include "rgw_log.h"
 TYPE(rgw_log_entry)
 
-#include "rgw/rgw_meta_sync_status.h"
+#include "rgw_meta_sync_status.h"
 TYPE(rgw_meta_sync_info)
 TYPE(rgw_meta_sync_marker)
 TYPE(rgw_meta_sync_status)
 
-#include "rgw/rgw_multi.h"
+#include "rgw_multi.h"
 TYPE(RGWUploadPartInfo)
 
-#include "rgw/rgw_data_sync.h"
+#include "rgw_data_sync.h"
 TYPE(rgw_data_sync_info)
 TYPE(rgw_data_sync_marker)
 TYPE(rgw_data_sync_status)
 
-#include "rgw/rgw_bucket_encryption.h"
+#include "rgw_bucket_encryption.h"
 TYPE(RGWBucketEncryptionConfig)
 
 #endif