From: Kefu Chai <kchai@redhat.com>
Date: Wed, 18 Jul 2018 07:57:46 +0000 (+0800)
Subject: common/config: change md_config_obs_impl's template param to ConfigProxy
X-Git-Tag: v14.0.1~777^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8435aa9bdad3d6ec0ff8fd46267be09e1ef1b064;p=ceph.git

common/config: change md_config_obs_impl's template param to ConfigProxy

we were using LockPolicy as this tempalte class's template parameter,
but turns out ConfigProxy is a better parameter for it. as ConfigProxy is
"closer" to md_config_obs_impl than LockPolicy is.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/common/config_fwd.h b/src/common/config_fwd.h
index 39af28dad4a..09500695d92 100644
--- a/src/common/config_fwd.h
+++ b/src/common/config_fwd.h
@@ -5,10 +5,10 @@
 #include "lock_policy.h"
 
 namespace ceph::internal {
-template<LockPolicy lp> class md_config_obs_impl;
+template<class ConfigProxy> class md_config_obs_impl;
 }
 
-class md_config_t;
-using md_config_obs_t =
-  ceph::internal::md_config_obs_impl<ceph::internal::LockPolicy::MUTEX>;
+struct md_config_t;
 class ConfigProxy;
+using md_config_obs_t =
+  ceph::internal::md_config_obs_impl<ConfigProxy>;
diff --git a/src/common/config_obs.h b/src/common/config_obs.h
index c32e4469207..4cd7c4d350e 100644
--- a/src/common/config_obs.h
+++ b/src/common/config_obs.h
@@ -28,7 +28,7 @@ namespace ceph::internal {
  * Subscribe for configuration changes by calling the md_config_t::add_observer() method
  * and unsubscribe using md_config_t::remove_observer().
  */
-template<LockPolicy lp>
+template<class ConfigProxy>
 class md_config_obs_impl {
 public:
   virtual ~md_config_obs_impl() {}