From: Kefu Chai <kchai@redhat.com>
Date: Tue, 29 Oct 2019 17:14:39 +0000 (+0800)
Subject: test/librados_test_stub: implement aio_create_completion2() and friends
X-Git-Tag: v15.1.0~1090^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c25b5a0d643a75f63828f5b4e9f5e45d9914525e;p=ceph.git

test/librados_test_stub: implement aio_create_completion2() and friends

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

diff --git a/src/test/librados_test_stub/LibradosTestStub.cc b/src/test/librados_test_stub/LibradosTestStub.cc
index c4345fcc5f48..be7af75e4a25 100644
--- a/src/test/librados_test_stub/LibradosTestStub.cc
+++ b/src/test/librados_test_stub/LibradosTestStub.cc
@@ -116,18 +116,14 @@ librados::TestRadosClient *create_rados_client() {
 
 } // anonymous namespace
 
-extern "C" int rados_aio_create_completion(void *cb_arg,
-                                           rados_callback_t cb_complete,
-                                           rados_callback_t cb_safe,
-                                           rados_completion_t *pc)
+extern "C" int rados_aio_create_completion2(void *cb_arg,
+					    rados_callback_t cb_complete,
+					    rados_completion_t *pc)
 {
   librados::AioCompletionImpl *c = new librados::AioCompletionImpl;
   if (cb_complete) {
     c->set_complete_callback(cb_arg, cb_complete);
   }
-  if (cb_safe) {
-    c->set_safe_callback(cb_arg, cb_safe);
-  }
   *pc = c;
   return 0;
 }
@@ -1005,10 +1001,9 @@ void Rados::from_rados_t(rados_t p, Rados &rados) {
 }
 
 AioCompletion *Rados::aio_create_completion(void *cb_arg,
-                                            callback_t cb_complete,
-                                            callback_t cb_safe) {
+                                            callback_t cb_complete) {
   AioCompletionImpl *c;
-  int r = rados_aio_create_completion(cb_arg, cb_complete, cb_safe,
+  int r = rados_aio_create_completion2(cb_arg, cb_complete,
       reinterpret_cast<void**>(&c));
   ceph_assert(r == 0);
   return new AioCompletion(c);