import 15.2.0 Octopus source

[ceph.git] / ceph / src / tools / rbd_ggate / Server.h

diff --git a/ceph/src/tools/rbd_ggate/Server.h b/ceph/src/tools/rbd_ggate/Server.h
index 8ed4f51201093c714fcd820732a1f91b87248589..bb31b89f7afa89f31acec85d9f7cdf0ff542ced5 100644 (file)
--- a/ceph/src/tools/rbd_ggate/Server.h
+++ b/ceph/src/tools/rbd_ggate/Server.h
@@ -6,8 +6,7 @@
 
 #include "include/rbd/librbd.hpp"
 #include "include/xlist.h"
-#include "common/Cond.h"
-#include "common/Mutex.h"
+#include "common/ceph_mutex.h"
 #include "common/Thread.h"
 
 namespace rbd {
@@ -56,8 +55,9 @@ private:
   Driver *m_drv;
   librbd::Image &m_image;
 
-  mutable Mutex m_lock;
-  Cond m_cond;
+  mutable ceph::mutex m_lock =
+    ceph::make_mutex("rbd::ggate::Server::m_lock");
+  ceph::condition_variable m_cond;
   bool m_stopping = false;
   ThreadHelper m_reader_thread, m_writer_thread;
   xlist<IOContext*> m_io_pending;