From 1b4e09eed15dab29e9b220747b7f976f85f0f6b2 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Sat, 18 Mar 2023 10:41:12 -0400 Subject: [PATCH] rgw/services: make set_attrs const correct Signed-off-by: Casey Bodley --- src/rgw/driver/rados/rgw_bucket.h | 8 ++++---- src/rgw/driver/rados/rgw_rados.cc | 4 ++-- src/rgw/driver/rados/rgw_rados.h | 4 ++-- src/rgw/driver/rados/rgw_tools.cc | 2 +- src/rgw/driver/rados/rgw_tools.h | 2 +- src/rgw/services/svc_bucket.h | 4 ++-- src/rgw/services/svc_bucket_sobj.cc | 4 ++-- src/rgw/services/svc_bucket_sobj.h | 4 ++-- src/rgw/services/svc_meta_be_sobj.h | 6 +++--- src/rgw/services/svc_sys_obj.h | 4 ++-- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/rgw/driver/rados/rgw_bucket.h b/src/rgw/driver/rados/rgw_bucket.h index 0110eff3343..857d530aab5 100644 --- a/src/rgw/driver/rados/rgw_bucket.h +++ b/src/rgw/driver/rados/rgw_bucket.h @@ -498,7 +498,7 @@ public: RGWObjVersionTracker *objv_tracker{nullptr}; ceph::real_time mtime; bool exclusive{false}; - std::map *attrs{nullptr}; + const std::map *attrs{nullptr}; PutParams() {} @@ -517,7 +517,7 @@ public: return *this; } - PutParams& set_attrs(std::map *_attrs) { + PutParams& set_attrs(const std::map *_attrs) { attrs = _attrs; return *this; } @@ -582,7 +582,7 @@ public: nullptr: orig_info was not found (new bucket instance */ ceph::real_time mtime; bool exclusive{false}; - std::map *attrs{nullptr}; + const std::map *attrs{nullptr}; RGWObjVersionTracker *objv_tracker{nullptr}; PutParams() {} @@ -602,7 +602,7 @@ public: return *this; } - PutParams& set_attrs(std::map *_attrs) { + PutParams& set_attrs(const std::map *_attrs) { attrs = _attrs; return *this; } diff --git a/src/rgw/driver/rados/rgw_rados.cc b/src/rgw/driver/rados/rgw_rados.cc index e2754eead72..1ec17637435 100644 --- a/src/rgw/driver/rados/rgw_rados.cc +++ b/src/rgw/driver/rados/rgw_rados.cc @@ -8587,7 +8587,7 @@ int RGWRados::try_refresh_bucket_info(RGWBucketInfo& info, } int RGWRados::put_bucket_instance_info(RGWBucketInfo& info, bool exclusive, - real_time mtime, map *pattrs, + real_time mtime, const map *pattrs, const DoutPrefixProvider *dpp, optional_yield y) { return ctl.bucket->store_bucket_instance_info(info.bucket, info, y, dpp, @@ -8598,7 +8598,7 @@ int RGWRados::put_bucket_instance_info(RGWBucketInfo& info, bool exclusive, } int RGWRados::put_linked_bucket_info(RGWBucketInfo& info, bool exclusive, real_time mtime, obj_version *pep_objv, - map *pattrs, bool create_entry_point, + const map *pattrs, bool create_entry_point, const DoutPrefixProvider *dpp, optional_yield y) { bool create_head = !info.has_instance_obj || create_entry_point; diff --git a/src/rgw/driver/rados/rgw_rados.h b/src/rgw/driver/rados/rgw_rados.h index 1727bd84758..18e818c4e89 100644 --- a/src/rgw/driver/rados/rgw_rados.h +++ b/src/rgw/driver/rados/rgw_rados.h @@ -1395,7 +1395,7 @@ public: std::map& stats, std::string *max_marker, bool* syncstopped = NULL); int get_bucket_stats_async(const DoutPrefixProvider *dpp, RGWBucketInfo& bucket_info, const rgw::bucket_index_layout_generation& idx_layout, int shard_id, RGWGetBucketStats_CB *cb); - int put_bucket_instance_info(RGWBucketInfo& info, bool exclusive, ceph::real_time mtime, std::map *pattrs, const DoutPrefixProvider *dpp, optional_yield y); + int put_bucket_instance_info(RGWBucketInfo& info, bool exclusive, ceph::real_time mtime, const std::map *pattrs, const DoutPrefixProvider *dpp, optional_yield y); /* xxx dang obj_ctx -> svc */ int get_bucket_instance_info(const std::string& meta_key, RGWBucketInfo& info, ceph::real_time *pmtime, std::map *pattrs, optional_yield y, const DoutPrefixProvider *dpp); int get_bucket_instance_info(const rgw_bucket& bucket, RGWBucketInfo& info, ceph::real_time *pmtime, std::map *pattrs, optional_yield y, const DoutPrefixProvider *dpp); @@ -1420,7 +1420,7 @@ public: std::map *pattrs = nullptr); int put_linked_bucket_info(RGWBucketInfo& info, bool exclusive, ceph::real_time mtime, obj_version *pep_objv, - std::map *pattrs, bool create_entry_point, + const std::map *pattrs, bool create_entry_point, const DoutPrefixProvider *dpp, optional_yield y); int cls_obj_prepare_op(const DoutPrefixProvider *dpp, BucketShard& bs, RGWModifyOp op, std::string& tag, rgw_obj& obj, uint16_t bilog_flags, optional_yield y, rgw_zone_set *zones_trace = nullptr); diff --git a/src/rgw/driver/rados/rgw_tools.cc b/src/rgw/driver/rados/rgw_tools.cc index cdc4be83a05..17c72012ab6 100644 --- a/src/rgw/driver/rados/rgw_tools.cc +++ b/src/rgw/driver/rados/rgw_tools.cc @@ -102,7 +102,7 @@ map* no_change_attrs() { int rgw_put_system_obj(const DoutPrefixProvider *dpp, RGWSI_SysObj* svc_sysobj, const rgw_pool& pool, const string& oid, bufferlist& data, bool exclusive, - RGWObjVersionTracker *objv_tracker, real_time set_mtime, optional_yield y, map *pattrs) + RGWObjVersionTracker *objv_tracker, real_time set_mtime, optional_yield y, const map *pattrs) { map no_attrs; if (!pattrs) { diff --git a/src/rgw/driver/rados/rgw_tools.h b/src/rgw/driver/rados/rgw_tools.h index 66600856d16..607b064b177 100644 --- a/src/rgw/driver/rados/rgw_tools.h +++ b/src/rgw/driver/rados/rgw_tools.h @@ -66,7 +66,7 @@ int rgw_put_system_obj(const DoutPrefixProvider *dpp, RGWSI_SysObj* svc_sysobj, bufferlist& data, bool exclusive, RGWObjVersionTracker *objv_tracker, real_time set_mtime, optional_yield y, - std::map *pattrs = nullptr); + const std::map *pattrs = nullptr); int rgw_get_system_obj(RGWSI_SysObj* svc_sysobj, const rgw_pool& pool, const std::string& key, bufferlist& bl, RGWObjVersionTracker *objv_tracker, real_time *pmtime, diff --git a/src/rgw/services/svc_bucket.h b/src/rgw/services/svc_bucket.h index 4a526e4f248..caf6e029452 100644 --- a/src/rgw/services/svc_bucket.h +++ b/src/rgw/services/svc_bucket.h @@ -49,7 +49,7 @@ public: RGWBucketEntryPoint& info, bool exclusive, real_time mtime, - std::map *pattrs, + const std::map *pattrs, RGWObjVersionTracker *objv_tracker, optional_yield y, const DoutPrefixProvider *dpp) = 0; @@ -86,7 +86,7 @@ public: nullptr: orig_info was not found (new bucket instance */ bool exclusive, real_time mtime, - std::map *pattrs, + const std::map *pattrs, optional_yield y, const DoutPrefixProvider *dpp) = 0; diff --git a/src/rgw/services/svc_bucket_sobj.cc b/src/rgw/services/svc_bucket_sobj.cc index 08a52801503..9927cc2d3a9 100644 --- a/src/rgw/services/svc_bucket_sobj.cc +++ b/src/rgw/services/svc_bucket_sobj.cc @@ -241,7 +241,7 @@ int RGWSI_Bucket_SObj::store_bucket_entrypoint_info(RGWSI_Bucket_EP_Ctx& ctx, RGWBucketEntryPoint& info, bool exclusive, real_time mtime, - map *pattrs, + const map *pattrs, RGWObjVersionTracker *objv_tracker, optional_yield y, const DoutPrefixProvider *dpp) @@ -492,7 +492,7 @@ int RGWSI_Bucket_SObj::store_bucket_instance_info(RGWSI_Bucket_BI_Ctx& ctx, std::optional orig_info, bool exclusive, real_time mtime, - map *pattrs, + const map *pattrs, optional_yield y, const DoutPrefixProvider *dpp) { diff --git a/src/rgw/services/svc_bucket_sobj.h b/src/rgw/services/svc_bucket_sobj.h index 8e9fe063c1b..7a466ca37dd 100644 --- a/src/rgw/services/svc_bucket_sobj.h +++ b/src/rgw/services/svc_bucket_sobj.h @@ -118,7 +118,7 @@ public: RGWBucketEntryPoint& info, bool exclusive, real_time mtime, - std::map *pattrs, + const std::map *pattrs, RGWObjVersionTracker *objv_tracker, optional_yield y, const DoutPrefixProvider *dpp) override; @@ -155,7 +155,7 @@ public: nullptr: orig_info was not found (new bucket instance */ bool exclusive, real_time mtime, - std::map *pattrs, + const std::map *pattrs, optional_yield y, const DoutPrefixProvider *dpp) override; diff --git a/src/rgw/services/svc_meta_be_sobj.h b/src/rgw/services/svc_meta_be_sobj.h index 304afc8bf2a..bf1ad1e68c7 100644 --- a/src/rgw/services/svc_meta_be_sobj.h +++ b/src/rgw/services/svc_meta_be_sobj.h @@ -70,15 +70,15 @@ struct RGWSI_MBSObj_GetParams : public RGWSI_MetaBackend::GetParams { struct RGWSI_MBSObj_PutParams : public RGWSI_MetaBackend::PutParams { bufferlist bl; - std::map *pattrs{nullptr}; + const std::map *pattrs{nullptr}; bool exclusive{false}; RGWSI_MBSObj_PutParams() {} - RGWSI_MBSObj_PutParams(std::map *_pattrs, + RGWSI_MBSObj_PutParams(const std::map *_pattrs, const ceph::real_time& _mtime) : RGWSI_MetaBackend::PutParams(_mtime), pattrs(_pattrs) {} RGWSI_MBSObj_PutParams(bufferlist& _bl, - std::map *_pattrs, + const std::map *_pattrs, const ceph::real_time& _mtime, bool _exclusive) : RGWSI_MetaBackend::PutParams(_mtime), bl(_bl), diff --git a/src/rgw/services/svc_sys_obj.h b/src/rgw/services/svc_sys_obj.h index f3e217dbde9..292340dcbe3 100644 --- a/src/rgw/services/svc_sys_obj.h +++ b/src/rgw/services/svc_sys_obj.h @@ -108,13 +108,13 @@ public: return *this; } - WOp& set_attrs(std::map& _attrs) { + WOp& set_attrs(const std::map& _attrs) { attrs = _attrs; return *this; } WOp& set_attrs(std::map&& _attrs) { - attrs = _attrs; + attrs = std::move(_attrs); return *this; } -- 2.39.5