From df4131c7a9bc6b61aadf315d33b0258b52b0fbed Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 26 Jul 2017 16:23:26 -0400 Subject: [PATCH] rgw: name arguments to RGWRESTConn::get_obj() Signed-off-by: Casey Bodley (cherry picked from commit 9bd1aa7facf94eed41c4235722490c91c9dbf399) --- src/rgw/rgw_rados.cc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 7a1fce857151b..c225046561ca9 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -7579,10 +7579,14 @@ int RGWRados::stat_remote_obj(RGWObjectCtx& obj_ctx, obj_time_weight dest_mtime_weight; + constexpr bool prepend_meta = true; + constexpr bool get_op = true; + constexpr bool rgwx_stat = true; + constexpr bool sync_manifest = true; int ret = conn->get_obj(user_id, info, src_obj, pmod, unmod_ptr, dest_mtime_weight.zone_short_id, dest_mtime_weight.pg_ver, - true /* prepend_meta */, true /* GET */, true /* rgwx-stat */, - true /* sync manifest */, &cb, &in_stream_req); + prepend_meta, get_op, rgwx_stat, + sync_manifest, &cb, &in_stream_req); if (ret < 0) { return ret; } @@ -7750,10 +7754,14 @@ int RGWRados::fetch_remote_obj(RGWObjectCtx& obj_ctx, } } + static constexpr bool prepend_meta = true; + static constexpr bool get_op = true; + static constexpr bool rgwx_stat = false; + static constexpr bool sync_manifest = true; ret = conn->get_obj(user_id, info, src_obj, pmod, unmod_ptr, dest_mtime_weight.zone_short_id, dest_mtime_weight.pg_ver, - true /* prepend_meta */, true /* GET */, false /* rgwx-stat */, - true /* sync manifest */, &cb, &in_stream_req); + prepend_meta, get_op, rgwx_stat, + sync_manifest, &cb, &in_stream_req); if (ret < 0) { goto set_err_state; } -- 2.39.5