From: Casey Bodley Date: Tue, 12 Jul 2022 18:56:49 +0000 (-0400) Subject: rgw: remove unused sysobj ctx args X-Git-Tag: v18.0.0~432^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5b425e51e44f2c013c4b9c769b02a896ab4c2382;p=ceph.git rgw: remove unused sysobj ctx args Signed-off-by: Casey Bodley --- diff --git a/src/rgw/services/svc_sys_obj.cc b/src/rgw/services/svc_sys_obj.cc index 5330f435d234..a19a66279f1f 100644 --- a/src/rgw/services/svc_sys_obj.cc +++ b/src/rgw/services/svc_sys_obj.cc @@ -36,10 +36,8 @@ int RGWSI_SysObj::Obj::ROp::stat(optional_yield y, const DoutPrefixProvider *dpp RGWSI_SysObj_Core *svc = source.core_svc; rgw_raw_obj& obj = source.obj; - return svc->stat(source.get_ctx(), *state, obj, - attrs, raw_attrs, - lastmod, obj_size, - objv_tracker, y, dpp); + return svc->stat(*state, obj, attrs, raw_attrs, + lastmod, obj_size, objv_tracker, y, dpp); } int RGWSI_SysObj::Obj::ROp::read(const DoutPrefixProvider *dpp, @@ -49,7 +47,7 @@ int RGWSI_SysObj::Obj::ROp::read(const DoutPrefixProvider *dpp, RGWSI_SysObj_Core *svc = source.core_svc; rgw_raw_obj& obj = source.get_obj(); - return svc->read(dpp, source.get_ctx(), *state, + return svc->read(dpp, *state, objv_tracker, obj, bl, ofs, end, attrs, @@ -73,9 +71,7 @@ int RGWSI_SysObj::Obj::WOp::remove(const DoutPrefixProvider *dpp, optional_yield RGWSI_SysObj_Core *svc = source.core_svc; rgw_raw_obj& obj = source.get_obj(); - return svc->remove(dpp, source.get_ctx(), - objv_tracker, - obj, y); + return svc->remove(dpp, objv_tracker, obj, y); } int RGWSI_SysObj::Obj::WOp::write(const DoutPrefixProvider *dpp, bufferlist& bl, optional_yield y) diff --git a/src/rgw/services/svc_sys_obj_cache.cc b/src/rgw/services/svc_sys_obj_cache.cc index 238db954dfe5..e329c37e36d0 100644 --- a/src/rgw/services/svc_sys_obj_cache.cc +++ b/src/rgw/services/svc_sys_obj_cache.cc @@ -85,7 +85,6 @@ void RGWSI_SysObj_Cache::normalize_pool_and_obj(const rgw_pool& src_pool, const int RGWSI_SysObj_Cache::remove(const DoutPrefixProvider *dpp, - RGWSysObjectCtxBase& obj_ctx, RGWObjVersionTracker *objv_tracker, const rgw_raw_obj& obj, optional_yield y) @@ -104,11 +103,10 @@ int RGWSI_SysObj_Cache::remove(const DoutPrefixProvider *dpp, ldpp_dout(dpp, 0) << "ERROR: " << __func__ << "(): failed to distribute cache: r=" << r << dendl; } - return RGWSI_SysObj_Core::remove(dpp, obj_ctx, objv_tracker, obj, y); + return RGWSI_SysObj_Core::remove(dpp, objv_tracker, obj, y); } int RGWSI_SysObj_Cache::read(const DoutPrefixProvider *dpp, - RGWSysObjectCtxBase& obj_ctx, RGWSI_SysObj_Obj_GetObjState& read_state, RGWObjVersionTracker *objv_tracker, const rgw_raw_obj& obj, @@ -122,7 +120,7 @@ int RGWSI_SysObj_Cache::read(const DoutPrefixProvider *dpp, rgw_pool pool; string oid; if (ofs != 0) { - return RGWSI_SysObj_Core::read(dpp, obj_ctx, read_state, objv_tracker, + return RGWSI_SysObj_Core::read(dpp, read_state, objv_tracker, obj, obl, ofs, end, attrs, raw_attrs, cache_info, refresh_version, y); } @@ -166,7 +164,7 @@ int RGWSI_SysObj_Cache::read(const DoutPrefixProvider *dpp, return -ENOENT; map unfiltered_attrset; - r = RGWSI_SysObj_Core::read(dpp, obj_ctx, read_state, objv_tracker, + r = RGWSI_SysObj_Core::read(dpp, read_state, objv_tracker, obj, obl, ofs, end, (attrs ? &unfiltered_attrset : nullptr), true, /* cache unfiltered attrs */ diff --git a/src/rgw/services/svc_sys_obj_cache.h b/src/rgw/services/svc_sys_obj_cache.h index a3628d84cdd2..79119a721de2 100644 --- a/src/rgw/services/svc_sys_obj_cache.h +++ b/src/rgw/services/svc_sys_obj_cache.h @@ -44,7 +44,6 @@ protected: optional_yield y) override; int read(const DoutPrefixProvider *dpp, - RGWSysObjectCtxBase& obj_ctx, RGWSI_SysObj_Obj_GetObjState& read_state, RGWObjVersionTracker *objv_tracker, const rgw_raw_obj& obj, @@ -66,7 +65,6 @@ protected: bool exclusive, optional_yield y) override; int remove(const DoutPrefixProvider *dpp, - RGWSysObjectCtxBase& obj_ctx, RGWObjVersionTracker *objv_tracker, const rgw_raw_obj& obj, optional_yield y) override; diff --git a/src/rgw/services/svc_sys_obj_core.cc b/src/rgw/services/svc_sys_obj_core.cc index 32d11e9153c7..3b1ea66ffc00 100644 --- a/src/rgw/services/svc_sys_obj_core.cc +++ b/src/rgw/services/svc_sys_obj_core.cc @@ -89,8 +89,7 @@ int RGWSI_SysObj_Core::raw_stat(const DoutPrefixProvider *dpp, const rgw_raw_obj return 0; } -int RGWSI_SysObj_Core::stat(RGWSysObjectCtxBase& obj_ctx, - RGWSI_SysObj_Obj_GetObjState& _state, +int RGWSI_SysObj_Core::stat(RGWSI_SysObj_Obj_GetObjState& _state, const rgw_raw_obj& obj, map *attrs, bool raw_attrs, @@ -131,7 +130,6 @@ int RGWSI_SysObj_Core::stat(RGWSysObjectCtxBase& obj_ctx, } int RGWSI_SysObj_Core::read(const DoutPrefixProvider *dpp, - RGWSysObjectCtxBase& obj_ctx, RGWSI_SysObj_Obj_GetObjState& _read_state, RGWObjVersionTracker *objv_tracker, const rgw_raw_obj& obj, @@ -446,7 +444,6 @@ int RGWSI_SysObj_Core::notify(const DoutPrefixProvider *dpp, const rgw_raw_obj& } int RGWSI_SysObj_Core::remove(const DoutPrefixProvider *dpp, - RGWSysObjectCtxBase& obj_ctx, RGWObjVersionTracker *objv_tracker, const rgw_raw_obj& obj, optional_yield y) diff --git a/src/rgw/services/svc_sys_obj_core.h b/src/rgw/services/svc_sys_obj_core.h index 6536d29c48e5..46de412f6247 100644 --- a/src/rgw/services/svc_sys_obj_core.h +++ b/src/rgw/services/svc_sys_obj_core.h @@ -40,7 +40,6 @@ protected: optional_yield y); virtual int read(const DoutPrefixProvider *dpp, - RGWSysObjectCtxBase& obj_ctx, RGWSI_SysObj_Obj_GetObjState& read_state, RGWObjVersionTracker *objv_tracker, const rgw_raw_obj& obj, @@ -52,7 +51,6 @@ protected: optional_yield y); virtual int remove(const DoutPrefixProvider *dpp, - RGWSysObjectCtxBase& obj_ctx, RGWObjVersionTracker *objv_tracker, const rgw_raw_obj& obj, optional_yield y); @@ -127,8 +125,7 @@ protected: virtual int pool_list_objects_get_marker(RGWSI_SysObj::Pool::ListCtx& _ctx, std::string *marker); - int stat(RGWSysObjectCtxBase& obj_ctx, - RGWSI_SysObj_Obj_GetObjState& state, + int stat(RGWSI_SysObj_Obj_GetObjState& state, const rgw_raw_obj& obj, std::map *attrs, bool raw_attrs,