import 15.2.0 Octopus source

[ceph.git] / ceph / src / client / MetaRequest.h

diff --git a/ceph/src/client/MetaRequest.h b/ceph/src/client/MetaRequest.h
index f9dfe9824265a26aa501f180cc6e59ea3e382e56..611d8e5d95397b3798e00bda0c5d58d1cc00d5bf 100644 (file)
--- a/ceph/src/client/MetaRequest.h
+++ b/ceph/src/client/MetaRequest.h
@@ -49,7 +49,7 @@ public:
   int      retry_attempt;
   std::atomic<uint64_t> ref = { 1 };
   
-  MClientReply::const_ref reply;         // the reply
+  ceph::cref_t<MClientReply> reply;         // the reply
   bool kick;
   bool success;
   
@@ -64,9 +64,9 @@ public:
   xlist<MetaRequest*>::item unsafe_dir_item;
   xlist<MetaRequest*>::item unsafe_target_item;
 
-  Cond  *caller_cond;          // who to take up
-  Cond  *dispatch_cond;        // who to kick back
-  list<Cond*> waitfor_safe;
+  ceph::condition_variable *caller_cond;          // who to take up
+  ceph::condition_variable *dispatch_cond;        // who to kick back
+  list<ceph::condition_variable*> waitfor_safe;
 
   InodeRef target;
   UserPerm perms;