From dc3e3a27e8c1cd5cd5765f50463d4422fbb1c584 Mon Sep 17 00:00:00 2001 From: Daniel Gryniewicz Date: Thu, 22 Jul 2021 11:48:08 -0400 Subject: [PATCH] RGW - Zipper - Make default args match in get_obj_state The default arg for follow_olh was different between the base class and the Rados class. Fix it so they're the same. Fixes: https://tracker.ceph.com/issues/51677 Signed-off-by: Daniel Gryniewicz (cherry picked from commit 664fe75c2a88cbcc27575649a6900640f4fd90b5) Conflicts: src/rgw/rgw_sal.h Cherry-pick notes: - changes to other parts of get_obj_state method signature --- src/rgw/rgw_sal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_sal.h b/src/rgw/rgw_sal.h index 41da8bc9d854e..9b331875ab559 100644 --- a/src/rgw/rgw_sal.h +++ b/src/rgw/rgw_sal.h @@ -474,7 +474,7 @@ class RGWObject { bool empty() const { return key.empty(); } const std::string &get_name() const { return key.name; } - virtual int get_obj_state(const DoutPrefixProvider *dpp, RGWObjectCtx *rctx, RGWBucket& bucket, RGWObjState **state, optional_yield y, bool follow_olh = false) = 0; + virtual int get_obj_state(const DoutPrefixProvider *dpp, RGWObjectCtx *rctx, RGWBucket& bucket, RGWObjState **state, optional_yield y, bool follow_olh = true) = 0; virtual int set_obj_attrs(const DoutPrefixProvider *dpp, RGWObjectCtx* rctx, RGWAttrs* setattrs, RGWAttrs* delattrs, optional_yield y, rgw_obj* target_obj = NULL) = 0; virtual int get_obj_attrs(RGWObjectCtx *rctx, optional_yield y, const DoutPrefixProvider *dpp, rgw_obj* target_obj = NULL) = 0; virtual int modify_obj_attrs(RGWObjectCtx *rctx, const char *attr_name, bufferlist& attr_val, optional_yield y, const DoutPrefixProvider *dpp) = 0; -- 2.39.5