import 15.2.2 octopus source

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

diff --git a/ceph/src/tools/rbd_mirror/ImageSync.h b/ceph/src/tools/rbd_mirror/ImageSync.h
index 0662732327068777c303c1e3c2296fc96be0dbfb..b1d88b857e3bc0370822db18291f98d2268cec98 100644 (file)
--- a/ceph/src/tools/rbd_mirror/ImageSync.h
+++ b/ceph/src/tools/rbd_mirror/ImageSync.h
@@ -14,7 +14,6 @@
 class Context;
 class ContextWQ;
 namespace journal { class Journaler; }
-namespace librbd { class ProgressContext; }
 namespace librbd { template <typename> class DeepCopyRequest; }
 
 namespace rbd {
@@ -90,7 +89,7 @@ private:
    * @endverbatim
    */
 
-  class ImageCopyProgressContext;
+  class ImageCopyProgressHandler;
 
   Threads<ImageCtxT>* m_threads;
   ImageCtxT *m_local_image_ctx;
@@ -104,7 +103,7 @@ private:
   bool m_canceled = false;
 
   librbd::DeepCopyRequest<ImageCtxT> *m_image_copy_request = nullptr;
-  librbd::ProgressContext *m_image_copy_prog_ctx = nullptr;
+  ImageCopyProgressHandler *m_image_copy_prog_handler = nullptr;
 
   bool m_updating_sync_point = false;
   Context *m_update_sync_ctx = nullptr;