From: Kefu Chai <kchai@redhat.com>
Date: Tue, 29 Oct 2019 07:08:57 +0000 (+0800)
Subject: librbd: use new aio_create_completion()
X-Git-Tag: v15.1.0~1090^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9e1d1deeaf23dba97ed292ba6f85d3d842fe3fcc;p=ceph.git

librbd: use new aio_create_completion()

to silence warnings like:

src/librbd/Utils.h:139:48: warning: 'static librados::v14_2_0::AioCompletion* librados::v14_2_0::Rados::aio_create_completion(void*, librados::callback_t, librados::callback_t)' is deprecated
[-Wdeprecated-declarations]
   return librados::Rados::aio_create_completion(
          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^
     obj, &detail::rados_callback<T, MF>, nullptr);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

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

diff --git a/src/librbd/Utils.h b/src/librbd/Utils.h
index 4695a10e6086..11a1634686e2 100644
--- a/src/librbd/Utils.h
+++ b/src/librbd/Utils.h
@@ -131,19 +131,19 @@ librados::AioCompletion *create_rados_callback(Context *on_finish);
 template <typename T>
 librados::AioCompletion *create_rados_callback(T *obj) {
   return librados::Rados::aio_create_completion(
-    obj, &detail::rados_callback<T>, nullptr);
+    obj, &detail::rados_callback<T>);
 }
 
 template <typename T, void(T::*MF)(int)>
 librados::AioCompletion *create_rados_callback(T *obj) {
   return librados::Rados::aio_create_completion(
-    obj, &detail::rados_callback<T, MF>, nullptr);
+    obj, &detail::rados_callback<T, MF>);
 }
 
 template <typename T, Context*(T::*MF)(int*), bool destroy=true>
 librados::AioCompletion *create_rados_callback(T *obj) {
   return librados::Rados::aio_create_completion(
-    obj, &detail::rados_state_callback<T, MF, destroy>, nullptr);
+    obj, &detail::rados_state_callback<T, MF, destroy>);
 }
 
 template <typename T, void(T::*MF)(int) = &T::complete>
diff --git a/src/tools/immutable_object_cache/Utils.h b/src/tools/immutable_object_cache/Utils.h
index 38f650665249..3c68cfa7b1f2 100644
--- a/src/tools/immutable_object_cache/Utils.h
+++ b/src/tools/immutable_object_cache/Utils.h
@@ -23,7 +23,7 @@ void rados_callback(rados_completion_t c, void *arg) {
 template <typename T, void(T::*MF)(int)=&T::complete>
 librados::AioCompletion *create_rados_callback(T *obj) {
   return librados::Rados::aio_create_completion(
-    obj, &detail::rados_callback<T, MF>, nullptr);
+    obj, &detail::rados_callback<T, MF>);
 }
 
 }  // namespace immutable_obj_cache