update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / tools / rbd_mirror / InstanceReplayer.h

diff --git a/ceph/src/tools/rbd_mirror/InstanceReplayer.h b/ceph/src/tools/rbd_mirror/InstanceReplayer.h
index 4721f742a3ae08405deb99d14e0c8f3736271ac1..0321d78c5afb34faa872a8487569835446ddeee7 100644 (file)
--- a/ceph/src/tools/rbd_mirror/InstanceReplayer.h
+++ b/ceph/src/tools/rbd_mirror/InstanceReplayer.h
@@ -10,14 +10,13 @@
 #include "common/AsyncOpTracker.h"
 #include "common/Formatter.h"
 #include "common/Mutex.h"
-#include "types.h"
+#include "tools/rbd_mirror/Types.h"
 
 namespace librbd { class ImageCtx; }
 
 namespace rbd {
 namespace mirror {
 
-template <typename> class ImageDeleter;
 template <typename> class ImageReplayer;
 template <typename> class InstanceWatcher;
 template <typename> class ServiceDaemon;
@@ -29,11 +28,10 @@ public:
   static InstanceReplayer* create(
       Threads<ImageCtxT> *threads,
       ServiceDaemon<ImageCtxT>* service_daemon,
-      ImageDeleter<ImageCtxT>* image_deleter,
       RadosRef local_rados, const std::string &local_mirror_uuid,
       int64_t local_pool_id) {
-    return new InstanceReplayer(threads, service_daemon, image_deleter,
-                                local_rados, local_mirror_uuid, local_pool_id);
+    return new InstanceReplayer(threads, service_daemon, local_rados,
+                                local_mirror_uuid, local_pool_id);
   }
   void destroy() {
     delete this;
@@ -41,7 +39,6 @@ public:
 
   InstanceReplayer(Threads<ImageCtxT> *threads,
                    ServiceDaemon<ImageCtxT>* service_daemon,
-                  ImageDeleter<ImageCtxT>* image_deleter,
                   RadosRef local_rados, const std::string &local_mirror_uuid,
                   int64_t local_pool_id);
   ~InstanceReplayer();
@@ -86,7 +83,6 @@ private:
 
   Threads<ImageCtxT> *m_threads;
   ServiceDaemon<ImageCtxT>* m_service_daemon;
-  ImageDeleter<ImageCtxT>* m_image_deleter;
   RadosRef m_local_rados;
   std::string m_local_mirror_uuid;
   int64_t m_local_pool_id;