From dffb5c37285ccb5350cddc37435af7f15b81a7ba Mon Sep 17 00:00:00 2001 From: Jos Collin Date: Wed, 18 Oct 2017 20:19:36 +0530 Subject: [PATCH] rgw: Fix getter function names in RGWEnv Fixed the getter function names as per the review comment in https://github.com/ceph/ceph/pull/17432 Signed-off-by: Jos Collin --- src/rgw/rgw_common.cc | 6 +++--- src/rgw/rgw_common.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc index 43a6a236354..49d675876bd 100644 --- a/src/rgw/rgw_common.cc +++ b/src/rgw/rgw_common.cc @@ -273,9 +273,9 @@ req_state::req_state(CephContext* _cct, RGWEnv* e, RGWUserInfo* u) : cct(_cct), cio(NULL), op(OP_UNKNOWN), user(u), has_acl_header(false), info(_cct, e) { - enable_ops_log = e->rgw_conf_get_enable_ops_log(); - enable_usage_log = e->rgw_conf_get_enable_usage_log(); - defer_to_bucket_acls = e->rgw_conf_get_defer_to_bucket_acls(); + enable_ops_log = e->get_enable_ops_log(); + enable_usage_log = e->get_enable_usage_log(); + defer_to_bucket_acls = e->get_defer_to_bucket_acls(); content_started = false; format = 0; formatter = NULL; diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h index ca4361c8c38..4c1583fc1a3 100644 --- a/src/rgw/rgw_common.h +++ b/src/rgw/rgw_common.h @@ -412,15 +412,15 @@ public: bool exists_prefix(const char *prefix) const; void remove(const char *name); const std::map& get_map() const { return env_map; } - int rgw_conf_get_enable_ops_log() const { + int get_enable_ops_log() const { return conf.enable_ops_log; } - int rgw_conf_get_enable_usage_log() const { + int get_enable_usage_log() const { return conf.enable_usage_log; } - int rgw_conf_get_defer_to_bucket_acls() const { + int get_defer_to_bucket_acls() const { return conf.defer_to_bucket_acls; } }; -- 2.47.3