import 14.2.4 nautilus point release

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

diff --git a/ceph/src/common/OutputDataSocket.h b/ceph/src/common/OutputDataSocket.h
index e974d1b58c5da33a3a14e7e0ce62dc7c9b9df299..682dfcc6cb6503e98378ffb086f6ac996f170113 100644 (file)
--- a/ceph/src/common/OutputDataSocket.h
+++ b/ceph/src/common/OutputDataSocket.h
@@ -55,13 +55,13 @@ protected:
   bool going_down;
 
   uint64_t data_size;
+  uint32_t skipped;
 
-  std::list<bufferlist> data;
+  std::vector<buffer::list> data;
 
   ceph::mutex m_lock = ceph::make_mutex("OutputDataSocket::m_lock");
   ceph::condition_variable cond;
-
-  bufferlist delim;
+  buffer::list delim;
 };
 
 #endif