From b8e70d5f9b7f6464393a696e40f7fec57952976c Mon Sep 17 00:00:00 2001
From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 15 Mar 2017 11:18:01 -0400
Subject: [PATCH] rbd-mirror: move replayer admin socket hook to anonymous
 namespace

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---
 src/tools/rbd_mirror/Replayer.cc | 4 ++--
 src/tools/rbd_mirror/Replayer.h  | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/tools/rbd_mirror/Replayer.cc b/src/tools/rbd_mirror/Replayer.cc
index 58b53a23ebec4..f8ee473e19292 100644
--- a/src/tools/rbd_mirror/Replayer.cc
+++ b/src/tools/rbd_mirror/Replayer.cc
@@ -127,8 +127,6 @@ private:
   Replayer *replayer;
 };
 
-} // anonymous namespace
-
 class ReplayerAdminSocketHook : public AdminSocketHook {
 public:
   ReplayerAdminSocketHook(CephContext *cct, const std::string &name,
@@ -207,6 +205,8 @@ private:
   Commands commands;
 };
 
+} // anonymous namespace
+
 struct Replayer::C_RefreshLocalImages : public Context {
   Replayer *replayer;
   Context *on_finish;
diff --git a/src/tools/rbd_mirror/Replayer.h b/src/tools/rbd_mirror/Replayer.h
index e1da95cc72796..f503d1495fe9d 100644
--- a/src/tools/rbd_mirror/Replayer.h
+++ b/src/tools/rbd_mirror/Replayer.h
@@ -22,13 +22,14 @@
 #include "ImageDeleter.h"
 #include "types.h"
 
+class AdminSocketHook;
+
 namespace librbd { class ImageCtx; }
 
 namespace rbd {
 namespace mirror {
 
 template <typename> struct Threads;
-class ReplayerAdminSocketHook;
 template <typename> class InstanceWatcher;
 
 /**
@@ -124,7 +125,7 @@ private:
   std::map<std::string, std::unique_ptr<ImageReplayer<> > > m_image_replayers;
 
   std::string m_asok_hook_name;
-  ReplayerAdminSocketHook *m_asok_hook;
+  AdminSocketHook *m_asok_hook;
 
   std::set<ImageId> m_init_image_ids;
 
-- 
2.39.5