From 4f72b20f09fcbe0cec0cdfd020ca370d6707fc8d Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Fri, 12 Jan 2018 13:41:50 -0500 Subject: [PATCH] rgw: RGWRados::put_system_obj takes const bufferlist Signed-off-by: Casey Bodley --- src/rgw/rgw_cache.h | 8 ++++---- src/rgw/rgw_rados.cc | 4 ++-- src/rgw/rgw_rados.h | 8 ++++---- src/rgw/rgw_tools.cc | 2 +- src/rgw/rgw_tools.h | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/rgw/rgw_cache.h b/src/rgw/rgw_cache.h index 3089723913d8..4691232d03d6 100644 --- a/src/rgw/rgw_cache.h +++ b/src/rgw/rgw_cache.h @@ -233,10 +233,10 @@ public: RGWObjVersionTracker *objv_tracker); int put_system_obj_impl(rgw_raw_obj& obj, uint64_t size, real_time *mtime, map& attrs, int flags, - bufferlist& data, + const bufferlist& data, RGWObjVersionTracker *objv_tracker, real_time set_mtime) override; - int put_system_obj_data(void *ctx, rgw_raw_obj& obj, bufferlist& bl, off_t ofs, bool exclusive, + int put_system_obj_data(void *ctx, rgw_raw_obj& obj, const bufferlist& bl, off_t ofs, bool exclusive, RGWObjVersionTracker *objv_tracker = nullptr) override; int get_system_obj(RGWObjectCtx& obj_ctx, RGWRados::SystemObject::Read::GetObjState& read_state, @@ -393,7 +393,7 @@ int RGWCache::system_obj_set_attrs(void *ctx, rgw_raw_obj& obj, template int RGWCache::put_system_obj_impl(rgw_raw_obj& obj, uint64_t size, real_time *mtime, map& attrs, int flags, - bufferlist& data, + const bufferlist& data, RGWObjVersionTracker *objv_tracker, real_time set_mtime) { @@ -431,7 +431,7 @@ int RGWCache::put_system_obj_impl(rgw_raw_obj& obj, uint64_t size, real_time } template -int RGWCache::put_system_obj_data(void *ctx, rgw_raw_obj& obj, bufferlist& data, off_t ofs, bool exclusive, +int RGWCache::put_system_obj_data(void *ctx, rgw_raw_obj& obj, const bufferlist& data, off_t ofs, bool exclusive, RGWObjVersionTracker *objv_tracker) { rgw_pool pool; diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 0d79e58f07aa..16346d77b39d 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -7124,7 +7124,7 @@ int RGWRados::Object::Write::write_meta(uint64_t size, uint64_t accounted_size, /** Write/overwrite a system object. */ int RGWRados::put_system_obj_impl(rgw_raw_obj& obj, uint64_t size, real_time *mtime, map& attrs, int flags, - bufferlist& data, + const bufferlist& data, RGWObjVersionTracker *objv_tracker, real_time set_mtime /* 0 for don't set */) { @@ -7185,7 +7185,7 @@ int RGWRados::put_system_obj_impl(rgw_raw_obj& obj, uint64_t size, real_time *mt return 0; } -int RGWRados::put_system_obj_data(void *ctx, rgw_raw_obj& obj, bufferlist& bl, +int RGWRados::put_system_obj_data(void *ctx, rgw_raw_obj& obj, const bufferlist& bl, off_t ofs, bool exclusive, RGWObjVersionTracker *objv_tracker) { diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h index 8f4b7d1fcf2d..0aaff9a26107 100644 --- a/src/rgw/rgw_rados.h +++ b/src/rgw/rgw_rados.h @@ -3040,17 +3040,17 @@ public: /** Write/overwrite an object to the bucket storage. */ virtual int put_system_obj_impl(rgw_raw_obj& obj, uint64_t size, ceph::real_time *mtime, map& attrs, int flags, - bufferlist& data, + const bufferlist& data, RGWObjVersionTracker *objv_tracker, ceph::real_time set_mtime /* 0 for don't set */); - virtual int put_system_obj_data(void *ctx, rgw_raw_obj& obj, bufferlist& bl, - off_t ofs, bool exclusive, + virtual int put_system_obj_data(void *ctx, rgw_raw_obj& obj, + const bufferlist& bl, off_t ofs, bool exclusive, RGWObjVersionTracker *objv_tracker = nullptr); int aio_put_obj_data(void *ctx, rgw_raw_obj& obj, bufferlist& bl, off_t ofs, bool exclusive, void **handle); - int put_system_obj(void *ctx, rgw_raw_obj& obj, bufferlist& data, bool exclusive, + int put_system_obj(void *ctx, rgw_raw_obj& obj, const bufferlist& data, bool exclusive, ceph::real_time *mtime, map& attrs, RGWObjVersionTracker *objv_tracker, ceph::real_time set_mtime) { int flags = PUT_OBJ_CREATE; diff --git a/src/rgw/rgw_tools.cc b/src/rgw/rgw_tools.cc index 504bb1842122..886bb316d5ca 100644 --- a/src/rgw/rgw_tools.cc +++ b/src/rgw/rgw_tools.cc @@ -18,7 +18,7 @@ static std::map* ext_mime_map; -int rgw_put_system_obj(RGWRados *rgwstore, const rgw_pool& pool, const string& oid, bufferlist& data, bool exclusive, +int rgw_put_system_obj(RGWRados *rgwstore, const rgw_pool& pool, const string& oid, const bufferlist& data, bool exclusive, RGWObjVersionTracker *objv_tracker, real_time set_mtime, map *pattrs) { map no_attrs; diff --git a/src/rgw/rgw_tools.h b/src/rgw/rgw_tools.h index d9d3f1484e18..1c12da8fde80 100644 --- a/src/rgw/rgw_tools.h +++ b/src/rgw/rgw_tools.h @@ -16,7 +16,7 @@ struct RGWObjVersionTracker; struct obj_version; -int rgw_put_system_obj(RGWRados *rgwstore, const rgw_pool& pool, const string& oid, bufferlist& data, bool exclusive, +int rgw_put_system_obj(RGWRados *rgwstore, const rgw_pool& pool, const string& oid, const bufferlist& data, bool exclusive, RGWObjVersionTracker *objv_tracker, real_time set_mtime, map *pattrs = NULL); int rgw_get_system_obj(RGWRados *rgwstore, RGWObjectCtx& obj_ctx, const rgw_pool& pool, const string& key, bufferlist& bl, RGWObjVersionTracker *objv_tracker, real_time *pmtime, map *pattrs = NULL, -- 2.47.3