librados: add Rados::aio_create_completion(arg, cb)

which does not take safe_cb, and will take the place of
Rados::aio_create_completion(arg, cb_complete, cb_safe)

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp
index d65d7cadf07b2d85f7c7bf4f8a27e1357fae1886..69e9c249c67e30953f862afa110919c2f912d63a 100644 (file)
--- a/src/include/rados/librados.hpp
+++ b/src/include/rados/librados.hpp
@@ -1476,7 +1476,9 @@ inline namespace v14_2_0 {
    // -- aio --
     static AioCompletion *aio_create_completion();
     static AioCompletion *aio_create_completion(void *cb_arg, callback_t cb_complete,
-                                               callback_t cb_safe);
+                                               callback_t cb_safe)
+      __attribute__ ((deprecated));
+    static AioCompletion *aio_create_completion(void *cb_arg, callback_t cb_complete);
     
     friend std::ostream& operator<<(std::ostream &oss, const Rados& r);
   private:

diff --git a/src/librados/librados_cxx.cc b/src/librados/librados_cxx.cc
index 3b2007270bb03a3908272c9c7343f93e68e99b01..c888d2d163bf102a120a868f3122c5cfc5ee414f 100644 (file)
--- a/src/librados/librados_cxx.cc
+++ b/src/librados/librados_cxx.cc
@@ -2798,6 +2798,15 @@ librados::AioCompletion *librados::Rados::aio_create_completion(void *cb_arg,
   return new AioCompletion(c);
 }
 
+librados::AioCompletion *librados::Rados::aio_create_completion(void *cb_arg,
+                                                               callback_t cb_complete)
+{
+  AioCompletionImpl *c;
+  int r = rados_aio_create_completion(cb_arg, cb_complete, (void**)&c);
+  ceph_assert(r == 0);
+  return new AioCompletion(c);
+}
+
 librados::ObjectOperation::ObjectOperation() : impl(new ObjectOperationImpl) {}
 
 librados::ObjectOperation::ObjectOperation(ObjectOperation&& rhs)