From: Adam C. Emerson <aemerson@redhat.com>
Date: Fri, 1 Nov 2019 19:04:08 +0000 (-0400)
Subject: journal: Un-deprecated version of aio_create_completion
X-Git-Tag: v15.1.0~945^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=752d12cd8d7ab009bc8a3d341b4aa53e84280d7b;p=ceph.git

journal: Un-deprecated version of aio_create_completion

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/journal/JournalTrimmer.cc b/src/journal/JournalTrimmer.cc
index 3f05d40e6b54..3ad4f3b09d88 100644
--- a/src/journal/JournalTrimmer.cc
+++ b/src/journal/JournalTrimmer.cc
@@ -136,9 +136,8 @@ void JournalTrimmer::remove_set(uint64_t object_set) {
                                              object_number);
 
     ldout(m_cct, 20) << "removing journal object " << oid << dendl;
-    librados::AioCompletion *comp =
-      librados::Rados::aio_create_completion(ctx, NULL,
-                                             utils::rados_ctx_callback);
+    auto comp =
+      librados::Rados::aio_create_completion(ctx, utils::rados_ctx_callback);
     int r = m_ioctx.aio_remove(oid, comp,
                                CEPH_OSD_FLAG_FULL_FORCE | CEPH_OSD_FLAG_FULL_TRY);
     ceph_assert(r == 0);
diff --git a/src/journal/ObjectPlayer.cc b/src/journal/ObjectPlayer.cc
index 939b294b6187..56eec51f68fc 100644
--- a/src/journal/ObjectPlayer.cc
+++ b/src/journal/ObjectPlayer.cc
@@ -78,9 +78,8 @@ void ObjectPlayer::fetch(Context *on_finish) {
   op.read(m_read_off, m_max_fetch_bytes, &context->read_bl, NULL);
   op.set_op_flags2(CEPH_OSD_OP_FLAG_FADVISE_DONTNEED);
 
-  librados::AioCompletion *rados_completion =
-    librados::Rados::aio_create_completion(context, utils::rados_ctx_callback,
-                                           NULL);
+  auto rados_completion =
+    librados::Rados::aio_create_completion(context, utils::rados_ctx_callback);
   int r = m_ioctx.aio_operate(m_oid, rados_completion, &op, 0, NULL);
   ceph_assert(r == 0);
   rados_completion->release();
diff --git a/src/journal/ObjectRecorder.cc b/src/journal/ObjectRecorder.cc
index 1823d7a88840..9d34d190b029 100644
--- a/src/journal/ObjectRecorder.cc
+++ b/src/journal/ObjectRecorder.cc
@@ -360,7 +360,7 @@ bool ObjectRecorder::send_appends(bool force, ceph::ref_t<FutureImpl> flush_futu
     }
 
     auto rados_completion = librados::Rados::aio_create_completion(
-      new C_AppendFlush(this, append_tid), nullptr, utils::rados_ctx_callback);
+      new C_AppendFlush(this, append_tid), utils::rados_ctx_callback);
     int r = m_ioctx.aio_operate(m_oid, rados_completion, &op);
     ceph_assert(r == 0);
     rados_completion->release();