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

rgw: Un-deprecated version of aio_create_completion

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

diff --git a/src/rgw/rgw_gc.cc b/src/rgw/rgw_gc.cc
index f44c367429e2..b8210edc8818 100644
--- a/src/rgw/rgw_gc.cc
+++ b/src/rgw/rgw_gc.cc
@@ -118,7 +118,7 @@ void RGWGC::on_defer_canceled(const cls_rgw_gc_obj_info& info)
   cls_rgw_gc_queue_defer_entry(op, cct->_conf->rgw_gc_obj_min_wait, info);
   cls_rgw_gc_remove(op, {tag});
 
-  auto c = librados::Rados::aio_create_completion(nullptr, nullptr, nullptr);
+  auto c = librados::Rados::aio_create_completion(nullptr, nullptr);
   store->gc_aio_operate(obj_names[i], c, &op);
   c->release();
 }
@@ -139,7 +139,7 @@ int RGWGC::async_defer_chain(const string& tag, const cls_rgw_obj_chain& chain)
     // enqueue succeeds
     cls_rgw_gc_remove(op, {tag});
 
-    auto c = librados::Rados::aio_create_completion(nullptr, nullptr, nullptr);
+    auto c = librados::Rados::aio_create_completion(nullptr, nullptr);
     int ret = store->gc_aio_operate(obj_names[i], c, &op);
     c->release();
     return ret;
@@ -158,7 +158,7 @@ int RGWGC::async_defer_chain(const string& tag, const cls_rgw_obj_chain& chain)
   state->info.chain = chain;
   state->info.tag = tag;
   state->completion = librados::Rados::aio_create_completion(
-      state.get(), async_defer_callback, nullptr);
+      state.get(), async_defer_callback);
 
   int ret = store->gc_aio_operate(obj_names[i], state->completion, &op);
   if (ret == 0) {
@@ -172,7 +172,7 @@ int RGWGC::remove(int index, const std::vector<string>& tags, AioCompletion **pc
   ObjectWriteOperation op;
   cls_rgw_gc_remove(op, tags);
 
-  auto c = librados::Rados::aio_create_completion(nullptr, nullptr, nullptr);
+  auto c = librados::Rados::aio_create_completion(nullptr, nullptr);
   int ret = store->gc_aio_operate(obj_names[index], c, &op);
   if (ret < 0) {
     c->release();
@@ -323,7 +323,7 @@ public:
       }
     }
 
-    AioCompletion *c = librados::Rados::aio_create_completion(NULL, NULL, NULL);
+    auto c = librados::Rados::aio_create_completion(nullptr, nullptr);
     int ret = ioctx->aio_operate(oid, c, op);
     if (ret < 0) {
       return ret;
diff --git a/src/rgw/rgw_metadata.cc b/src/rgw/rgw_metadata.cc
index 2f4b9f9fd4ce..283a5574c90b 100644
--- a/src/rgw/rgw_metadata.cc
+++ b/src/rgw/rgw_metadata.cc
@@ -211,7 +211,7 @@ static void _mdlog_info_completion(librados::completion_t cb, void *arg)
 }
 
 RGWMetadataLogInfoCompletion::RGWMetadataLogInfoCompletion(info_callback_t cb)
-  : completion(librados::Rados::aio_create_completion((void *)this, nullptr,
+  : completion(librados::Rados::aio_create_completion((void *)this,
                                                       _mdlog_info_completion)),
     callback(cb)
 {
diff --git a/src/rgw/services/svc_notify.cc b/src/rgw/services/svc_notify.cc
index 5e3fbb2b6b91..a7148adadb09 100644
--- a/src/rgw/services/svc_notify.cc
+++ b/src/rgw/services/svc_notify.cc
@@ -95,7 +95,7 @@ public:
       register_completion->release();
       register_completion = nullptr;
     }
-    register_completion = librados::Rados::aio_create_completion(nullptr, nullptr, nullptr);
+    register_completion = librados::Rados::aio_create_completion(nullptr, nullptr);
     register_ret = obj.aio_watch(register_completion, &watch_handle, this);
     if (register_ret < 0) {
       register_completion->release();