import 15.2.5

[ceph.git] / ceph / src / librbd / ImageCtx.h

diff --git a/ceph/src/librbd/ImageCtx.h b/ceph/src/librbd/ImageCtx.h
index 79908cf18dc43d72067187b9b1dde2e569f2859f..1218f8380a6bb444560db255eb4d7b416325b5e0 100644 (file)
--- a/ceph/src/librbd/ImageCtx.h
+++ b/ceph/src/librbd/ImageCtx.h
@@ -42,6 +42,7 @@ class SafeTimer;
 
 namespace librbd {
 
+  template <typename> class ConfigWatcher;
   template <typename> class ExclusiveLock;
   template <typename> class ImageState;
   template <typename> class ImageWatcher;
@@ -109,6 +110,8 @@ namespace librbd {
     cls::rbd::SnapshotNamespace snap_namespace;
     std::string snap_name;
     IoCtx data_ctx, md_ctx;
+
+    ConfigWatcher<ImageCtx> *config_watcher = nullptr;
     ImageWatcher<ImageCtx> *image_watcher;
     Journal<ImageCtx> *journal;
 
@@ -189,9 +192,6 @@ namespace librbd {
       io::AioCompletion*,
       boost::lockfree::allocator<ceph::allocator<void>>> Completions;
 
-    Completions external_callback_completions;
-    std::atomic<bool> external_callback_in_progress = {false};
-
     Completions event_socket_completions;
     EventSocket event_socket;