From 60dadf3c8d56eea2a6b2074599404fa74345bcc8 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Mon, 20 Feb 2023 08:06:52 -0500 Subject: [PATCH] rgw/rados: remove get_obj_state() overload for follow_olh=true and just add the follow_olh=true argument to callers Signed-off-by: Casey Bodley --- src/rgw/driver/rados/rgw_putobj_processor.cc | 5 +++-- src/rgw/driver/rados/rgw_rados.cc | 4 +++- src/rgw/driver/rados/rgw_rados.h | 10 +++++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/rgw/driver/rados/rgw_putobj_processor.cc b/src/rgw/driver/rados/rgw_putobj_processor.cc index 65fbd5791d5e4..b6d08e5c7f383 100644 --- a/src/rgw/driver/rados/rgw_putobj_processor.cc +++ b/src/rgw/driver/rados/rgw_putobj_processor.cc @@ -595,9 +595,10 @@ int AppendObjectProcessor::process_first_chunk(bufferlist &&data, rgw::sal::Data int AppendObjectProcessor::prepare(optional_yield y) { - RGWObjState *astate; + RGWObjState *astate = nullptr; + constexpr bool follow_olh = true; int r = store->get_obj_state(dpp, &obj_ctx, bucket_info, head_obj, - &astate, &cur_manifest, y); + &astate, &cur_manifest, follow_olh, y); if (r < 0) { return r; } diff --git a/src/rgw/driver/rados/rgw_rados.cc b/src/rgw/driver/rados/rgw_rados.cc index 3632e66af595b..efb7fd37f61ce 100644 --- a/src/rgw/driver/rados/rgw_rados.cc +++ b/src/rgw/driver/rados/rgw_rados.cc @@ -4658,7 +4658,9 @@ int RGWRados::copy_obj(RGWObjectCtx& obj_ctx, RGWObjState *astate = NULL; RGWObjManifest *amanifest = nullptr; - ret = get_obj_state(dpp, &obj_ctx, src_bucket_info, src_obj, &astate, &amanifest, y); + constexpr bool follow_olh = true; + ret = get_obj_state(dpp, &obj_ctx, src_bucket_info, src_obj, + &astate, &amanifest, follow_olh, y); if (ret < 0) { return ret; } diff --git a/src/rgw/driver/rados/rgw_rados.h b/src/rgw/driver/rados/rgw_rados.h index 77a08c068a647..cde2fa66bdfa4 100644 --- a/src/rgw/driver/rados/rgw_rados.h +++ b/src/rgw/driver/rados/rgw_rados.h @@ -1268,11 +1268,11 @@ public: optional_yield y, ceph::real_time set_mtime = ceph::real_clock::zero()); - int get_obj_state(const DoutPrefixProvider *dpp, RGWObjectCtx *rctx, RGWBucketInfo& bucket_info, const rgw_obj& obj, RGWObjState **state, RGWObjManifest** manifest, - bool follow_olh, optional_yield y, bool assume_noent = false); - int get_obj_state(const DoutPrefixProvider *dpp, RGWObjectCtx *rctx, RGWBucketInfo& bucket_info, const rgw_obj& obj, RGWObjState **state, RGWObjManifest** manifest, optional_yield y) { - return get_obj_state(dpp, rctx, bucket_info, obj, state, manifest, true, y); - } + int get_obj_state(const DoutPrefixProvider *dpp, RGWObjectCtx *rctx, + RGWBucketInfo& bucket_info, const rgw_obj& obj, + RGWObjState** pstate, RGWObjManifest** pmanifest, + bool follow_olh, optional_yield y, + bool assume_noent = false); using iterate_obj_cb = int (*)(const DoutPrefixProvider*, const rgw_raw_obj&, off_t, off_t, off_t, bool, RGWObjState*, void*); -- 2.39.5