update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / common / OutputDataSocket.h

diff --git a/ceph/src/common/OutputDataSocket.h b/ceph/src/common/OutputDataSocket.h
index 0bce1ded790de82f8a2702a72fd362331b632bf5..e974d1b58c5da33a3a14e7e0ce62dc7c9b9df299 100644 (file)
--- a/ceph/src/common/OutputDataSocket.h
+++ b/ceph/src/common/OutputDataSocket.h
@@ -15,7 +15,9 @@
 #ifndef CEPH_COMMON_OUTPUTDATASOCKET_H
 #define CEPH_COMMON_OUTPUTDATASOCKET_H
 
-#include "common/Cond.h"
+#include "common/ceph_mutex.h"
+#include "common/Thread.h"
+#include "include/buffer.h"
 
 class CephContext;
 
@@ -56,8 +58,8 @@ protected:
 
   std::list<bufferlist> data;
 
-  Mutex m_lock;
-  Cond cond;
+  ceph::mutex m_lock = ceph::make_mutex("OutputDataSocket::m_lock");
+  ceph::condition_variable cond;
 
   bufferlist delim;
 };