update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / librbd / mirror / EnableRequest.h

diff --git a/ceph/src/librbd/mirror/EnableRequest.h b/ceph/src/librbd/mirror/EnableRequest.h
index 574dfe2bc03d091dd8107d375d1810385ac18c02..391028e6e5db3c4b66286332a94028304ac7d7fa 100644 (file)
--- a/ceph/src/librbd/mirror/EnableRequest.h
+++ b/ceph/src/librbd/mirror/EnableRequest.h
@@ -14,9 +14,11 @@
 #include <string>
 
 class Context;
-class ContextWQ;
 
 namespace librbd {
+
+namespace asio { struct ContextWQ; }
+
 namespace mirror {
 
 template <typename ImageCtxT = ImageCtx>
@@ -34,7 +36,7 @@ public:
                                const std::string &image_id,
                                cls::rbd::MirrorImageMode mode,
                                const std::string &non_primary_global_image_id,
-                               bool image_clean, ContextWQ *op_work_queue,
+                               bool image_clean, asio::ContextWQ *op_work_queue,
                                Context *on_finish) {
     return new EnableRequest(io_ctx, image_id, nullptr, mode,
                              non_primary_global_image_id, image_clean,
@@ -67,7 +69,7 @@ private:
    *    v (skip if not needed)    *
    * ENABLE_NON_PRIMARY_FEATURE   *
    *    |                         *
-   *    v                         *
+   *    v (skip if not needed)    *
    * IMAGE_STATE_UPDATE * * * * * *
    *    |                         *
    *    v                         *
@@ -79,7 +81,8 @@ private:
   EnableRequest(librados::IoCtx &io_ctx, const std::string &image_id,
                 ImageCtxT* image_ctx, cls::rbd::MirrorImageMode mode,
                 const std::string &non_primary_global_image_id,
-                bool image_clean, ContextWQ *op_work_queue, Context *on_finish);
+                bool image_clean, asio::ContextWQ *op_work_queue,
+                Context *on_finish);
 
   librados::IoCtx &m_io_ctx;
   std::string m_image_id;
@@ -87,7 +90,7 @@ private:
   cls::rbd::MirrorImageMode m_mode;
   std::string m_non_primary_global_image_id;
   bool m_image_clean;
-  ContextWQ *m_op_work_queue;
+  asio::ContextWQ *m_op_work_queue;
   Context *m_on_finish;
 
   CephContext *m_cct = nullptr;