From: Kefu Chai <kchai@redhat.com>
Date: Tue, 22 Oct 2019 06:10:16 +0000 (+0800)
Subject: librados: mark wait_for_safe() functions deprecated
X-Git-Tag: v15.1.0~1090^2~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=46fa68eb10f7deb0798c4bca364636a7d84d1711;p=ceph.git

librados: mark wait_for_safe() functions deprecated

safe is an alias of completed since
af01db76f63a22178509b402776da54164af1eb0. there is no need to have
two callbacks for tracking the state of an async operation anymore.

in this change, wait_for_safe() and friends are marked "deprecated"

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

diff --git a/src/include/rados/librados.h b/src/include/rados/librados.h
index 9352262deaf7..15d9f217ec5a 100644
--- a/src/include/rados/librados.h
+++ b/src/include/rados/librados.h
@@ -1890,7 +1890,8 @@ CEPH_RADOS_API int rados_aio_wait_for_complete(rados_completion_t c);
  * @param c operation to wait for
  * @returns 0
  */
-CEPH_RADOS_API int rados_aio_wait_for_safe(rados_completion_t c);
+CEPH_RADOS_API int rados_aio_wait_for_safe(rados_completion_t c)
+  __attribute__((deprecated));
 
 /**
  * Has an asynchronous operation completed?
@@ -1936,7 +1937,8 @@ CEPH_RADOS_API int rados_aio_wait_for_complete_and_cb(rados_completion_t c);
  * @param c operation to wait for
  * @returns 0
  */
-CEPH_RADOS_API int rados_aio_wait_for_safe_and_cb(rados_completion_t c);
+CEPH_RADOS_API int rados_aio_wait_for_safe_and_cb(rados_completion_t c)
+  __attribute__((deprecated));
 
 /**
  * Has an asynchronous operation and callback completed
diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp
index 4204d22afe99..d65d7cadf07b 100644
--- a/src/include/rados/librados.hpp
+++ b/src/include/rados/librados.hpp
@@ -192,15 +192,16 @@ inline namespace v14_2_0 {
   struct CEPH_RADOS_API AioCompletion {
     AioCompletion(AioCompletionImpl *pc_) : pc(pc_) {}
     int set_complete_callback(void *cb_arg, callback_t cb);
-    int set_safe_callback(void *cb_arg, callback_t cb);
+    int set_safe_callback(void *cb_arg, callback_t cb)
+      __attribute__ ((deprecated));
     int wait_for_complete();
-    int wait_for_safe();
+    int wait_for_safe() __attribute__ ((deprecated));
     int wait_for_complete_and_cb();
-    int wait_for_safe_and_cb();
+    int wait_for_safe_and_cb() __attribute__ ((deprecated));
     bool is_complete();
-    bool is_safe();
+    bool is_safe() __attribute__ ((deprecated));
     bool is_complete_and_cb();
-    bool is_safe_and_cb();
+    bool is_safe_and_cb() __attribute__ ((deprecated));
     int get_return_value();
     int get_version() __attribute__ ((deprecated));
     uint64_t get_version64();
diff --git a/src/include/radosstriper/libradosstriper.hpp b/src/include/radosstriper/libradosstriper.hpp
index 674a56b71e53..fb790b0d7ef1 100644
--- a/src/include/radosstriper/libradosstriper.hpp
+++ b/src/include/radosstriper/libradosstriper.hpp
@@ -22,15 +22,15 @@ namespace libradosstriper
     MultiAioCompletion(MultiAioCompletionImpl *pc_) : pc(pc_) {}
     ~MultiAioCompletion();
     int set_complete_callback(void *cb_arg, librados::callback_t cb);
-    int set_safe_callback(void *cb_arg, librados::callback_t cb);
+    int set_safe_callback(void *cb_arg, librados::callback_t cb) __attribute__ ((deprecated));
     void wait_for_complete();
-    void wait_for_safe();
+    void wait_for_safe() __attribute__ ((deprecated));
     void wait_for_complete_and_cb();
-    void wait_for_safe_and_cb();
+    void wait_for_safe_and_cb() __attribute__ ((deprecated));
     bool is_complete();
-    bool is_safe();
+    bool is_safe() __attribute__ ((deprecated));
     bool is_complete_and_cb();
-    bool is_safe_and_cb();
+    bool is_safe_and_cb() __attribute__ ((deprecated));
     int get_return_value();
     void release();
     MultiAioCompletionImpl *pc;