From: Kefu Chai <kchai@redhat.com>
Date: Wed, 15 Aug 2018 05:45:01 +0000 (+0800)
Subject: common: replace "ceph::internal" namespace with "ceph"
X-Git-Tag: v14.0.1~540^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e5e883bae5bda11512baa1b446dbafad242b38f4;p=ceph.git

common: replace "ceph::internal" namespace with "ceph"

when ceph::internal became a part of the interface, it's not "internal"
anymore.

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

diff --git a/src/common/config_fwd.h b/src/common/config_fwd.h
index 09500695d921..7b7ff28e5366 100644
--- a/src/common/config_fwd.h
+++ b/src/common/config_fwd.h
@@ -4,11 +4,10 @@
 
 #include "lock_policy.h"
 
-namespace ceph::internal {
+namespace ceph {
 template<class ConfigProxy> class md_config_obs_impl;
 }
 
 struct md_config_t;
 class ConfigProxy;
-using md_config_obs_t =
-  ceph::internal::md_config_obs_impl<ConfigProxy>;
+using md_config_obs_t = ceph::md_config_obs_impl<ConfigProxy>;
diff --git a/src/common/config_obs.h b/src/common/config_obs.h
index 4cd7c4d350ec..0cbbdb37397a 100644
--- a/src/common/config_obs.h
+++ b/src/common/config_obs.h
@@ -20,8 +20,7 @@
 
 #include "common/config_fwd.h"
 
-namespace ceph::internal {
-
+namespace ceph {
 /** @brief Base class for configuration observers.
  * Use this as a base class for your object if it has to respond to configuration changes,
  * for example by updating some values or modifying its behavior.
@@ -45,5 +44,4 @@ public:
 				    const std::set<int>& changed) { }
 };
 }
-
 #endif
diff --git a/src/common/lock_cond.h b/src/common/lock_cond.h
index 20519cee16cf..acfb778fa8a8 100644
--- a/src/common/lock_cond.h
+++ b/src/common/lock_cond.h
@@ -8,7 +8,7 @@
 
 class SharedLRUTest;
 
-namespace ceph::internal {
+namespace ceph {
 
 // empty helper class except when the template argument is LockPolicy::MUTEX
 template<LockPolicy lock_policy>
@@ -39,4 +39,5 @@ private:
   friend class ::SharedLRUTest;
 };
 
-} // namespace ceph::internal
+} // namespace ceph
+
diff --git a/src/common/lock_mutex.h b/src/common/lock_mutex.h
index ea69d319fabe..793ec964efed 100644
--- a/src/common/lock_mutex.h
+++ b/src/common/lock_mutex.h
@@ -7,7 +7,7 @@
 
 class SharedLRUTest;
 
-namespace ceph::internal {
+namespace ceph {
 
 template<LockPolicy lp> class LockCond;
 
@@ -48,4 +48,4 @@ private:
   friend class ::SharedLRUTest;
 };
 
-} // namespace ceph::internal
+} // namespace ceph
diff --git a/src/common/lock_policy.h b/src/common/lock_policy.h
index e710c18e9a86..0be74a8f9508 100644
--- a/src/common/lock_policy.h
+++ b/src/common/lock_policy.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-namespace ceph::internal {
+namespace ceph {
 
 enum class LockPolicy {
   SINGLE,
diff --git a/src/common/lock_shared_ptr.h b/src/common/lock_shared_ptr.h
index 0e2f6e8cf2e3..e915d7b78473 100644
--- a/src/common/lock_shared_ptr.h
+++ b/src/common/lock_shared_ptr.h
@@ -6,7 +6,7 @@
 #include <memory>
 #include <boost/smart_ptr/local_shared_ptr.hpp>
 
-namespace ceph::internal {
+namespace ceph {
 
 template<LockPolicy lock_policy>
 struct SharedPtrTrait {
diff --git a/src/common/shared_cache.hpp b/src/common/shared_cache.hpp
index a79d7d95a63e..5eeb4724933f 100644
--- a/src/common/shared_cache.hpp
+++ b/src/common/shared_cache.hpp
@@ -27,15 +27,15 @@
 #include "include/assert.h"
 
 template <class K, class V,
-	  ceph::internal::LockPolicy lock_policy = ceph::internal::LockPolicy::MUTEX>
+	  ceph::LockPolicy lock_policy = ceph::LockPolicy::MUTEX>
 class SharedLRU {
   CephContext *cct;
-  using shared_ptr_trait_t = ceph::internal::SharedPtrTrait<lock_policy>;
+  using shared_ptr_trait_t = SharedPtrTrait<lock_policy>;
   using VPtr = typename shared_ptr_trait_t::template shared_ptr<V>;
   using WeakVPtr = typename shared_ptr_trait_t::template weak_ptr<V>;
-  ceph::internal::LockMutex<lock_policy> lock;
+  LockMutex<lock_policy> lock;
   size_t max_size;
-  ceph::internal::LockCond<lock_policy> cond;
+  LockCond<lock_policy> cond;
   unsigned size;
 public:
   int waiting;
diff --git a/src/crimson/common/config_proxy.h b/src/crimson/common/config_proxy.h
index 807ca958d5e3..04c85251124f 100644
--- a/src/crimson/common/config_proxy.h
+++ b/src/crimson/common/config_proxy.h
@@ -24,7 +24,7 @@ class ConfigProxy : public seastar::peering_sharded_service<ConfigProxy>
   md_config_t* remote_config = nullptr;
   std::unique_ptr<md_config_t> local_config;
 
-  using ConfigObserver = ceph::internal::md_config_obs_impl<ConfigProxy>;
+  using ConfigObserver = ceph::md_config_obs_impl<ConfigProxy>;
   ObserverMgr<ConfigObserver> obs_mgr;
 
   const md_config_t& get_config() const {