Merge pull request #17129 from C2python/clear_para

rgw: Remove unused Parameter in Function RGWConf::init() Reviewed-by: Jos Collin <jcollin@redhat.com> Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
ceph · Sep 3, 2017 · 1970d8f · 1970d8f
2 parents c30ef87 + 16dd6a4
commit 1970d8f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
@@ -385,7 +385,7 @@ class RGWEnv;
 class RGWConf {
   friend class RGWEnv;
 protected:
-  void init(CephContext *cct, RGWEnv* env);
+  void init(CephContext *cct);
 public:
   RGWConf()
     : enable_ops_log(1),

diff --git a/src/rgw/rgw_env.cc b/src/rgw/rgw_env.cc
@@ -14,7 +14,7 @@
 
 void RGWEnv::init(CephContext *cct)
 {
-  conf.init(cct, this);
+  conf.init(cct);
 }
 
 void RGWEnv::set(const boost::string_ref& name, const boost::string_ref& val)
@@ -127,7 +127,7 @@ void RGWEnv::remove(const char *name)
     env_map.erase(iter);
 }
 
-void RGWConf::init(CephContext *cct, RGWEnv *env)
+void RGWConf::init(CephContext *cct)
 {
   enable_ops_log = cct->_conf->rgw_enable_ops_log;
   enable_usage_log = cct->_conf->rgw_enable_usage_log;