From: Kefu Chai <kchai@redhat.com>
Date: Fri, 13 Jul 2018 07:04:24 +0000 (+0800)
Subject: common/config_values: friend md_config_impl<>
X-Git-Tag: v14.0.1~882^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6147ed1bbd99b5a9b78ad0fa6064c416f61383d2;p=ceph.git

common/config_values: friend md_config_impl<>

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

diff --git a/src/common/config_values.h b/src/common/config_values.h
index 8ac5f2166c7d..bbd4d3224be2 100644
--- a/src/common/config_values.h
+++ b/src/common/config_values.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <utility>
 
+#include "common/config_fwd.h"
 #include "common/entity_name.h"
 #include "common/options.h"
 #include "log/SubsystemMap.h"
@@ -17,6 +18,9 @@ class ConfigValues {
   using changed_set_t = std::set<std::string>;
   using values_t = std::map<std::string, map<int32_t,Option::value_t>>;
   values_t values;
+  // for populating md_config_impl::legacy_values in ctor
+  template<ceph::internal::LockPolicy lock_policy>
+  friend struct ceph::internal::md_config_impl;
 
 public:
   EntityName name;