update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / libradosstriper / MultiAioCompletionImpl.h

diff --git a/ceph/src/libradosstriper/MultiAioCompletionImpl.h b/ceph/src/libradosstriper/MultiAioCompletionImpl.h
index 32f7b9a84cf92274f2b420de7edd40893a8988f0..3ac3aae44920fcef0ea3526da0d06c6d8e78d6ea 100644 (file)
--- a/ceph/src/libradosstriper/MultiAioCompletionImpl.h
+++ b/ceph/src/libradosstriper/MultiAioCompletionImpl.h
@@ -20,7 +20,9 @@
 #include "common/ceph_mutex.h"
 #include "include/radosstriper/libradosstriper.hpp"
 
-struct libradosstriper::MultiAioCompletionImpl {
+namespace libradosstriper {
+
+struct MultiAioCompletionImpl {
 
   ceph::mutex lock = ceph::make_mutex("MultiAioCompletionImpl lock", false);
   ceph::condition_variable cond;
@@ -151,10 +153,17 @@ struct libradosstriper::MultiAioCompletionImpl {
   void complete_request(ssize_t r);
   void safe_request(ssize_t r);
   void finish_adding_requests();
-
 };
 
-void intrusive_ptr_add_ref(libradosstriper::MultiAioCompletionImpl*);
-void intrusive_ptr_release(libradosstriper::MultiAioCompletionImpl*);
+inline void intrusive_ptr_add_ref(MultiAioCompletionImpl* ptr)
+{
+  ptr->get();
+}
+
+inline void intrusive_ptr_release(MultiAioCompletionImpl* ptr)
+{
+  ptr->put();
+}
+}
 
 #endif // CEPH_LIBRADOSSTRIPERSTRIPER_MULTIAIOCOMPLETIONIMPL_H