From: Boris Ranto <branto@redhat.com>
Date: Tue, 3 Aug 2021 07:26:16 +0000 (+0200)
Subject: rados: Fix function ordering
X-Git-Tag: v16.2.11~358^2~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3ce8b7980653f11d80273b67d1ad1fe8a4869791;p=ceph.git

rados: Fix function ordering

The build fails because the function definitions are out of order. This
also reuses the LIBRADOS_C_API_DEFAULT_F macro for function definitions.

Fixes: https://tracker.ceph.com/issues/40060
Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit d79efb024cb6788a95885160bdd0d3a256f439f2)
---

diff --git a/src/librados/librados_c.cc b/src/librados/librados_c.cc
index ca8f7c3c4890..9cff62553efb 100644
--- a/src/librados/librados_c.cc
+++ b/src/librados/librados_c.cc
@@ -532,21 +532,23 @@ extern "C" void LIBRADOS_C_API_DEFAULT_F(rados_unset_osdmap_full_try)(
   librados::IoCtxImpl *ctx = (librados::IoCtxImpl *)io;
   ctx->extra_op_flags &= ~CEPH_OSD_FLAG_FULL_TRY;
 }
-LIBRADOS_C_API_BASE_DEFAULT(rados_unset_pool_full_try);
+LIBRADOS_C_API_BASE_DEFAULT(rados_unset_osdmap_full_try);
 
-extern "C" void _rados_set_pool_full_try(rados_ioctx_t io)
+extern "C" void LIBRADOS_C_API_DEFAULT_F(rados_set_pool_full_try)(
+  rados_ioctx_t io)
 {
   librados::IoCtxImpl *ctx = (librados::IoCtxImpl *)io;
   ctx->extra_op_flags |= CEPH_OSD_FLAG_FULL_TRY;
 }
 LIBRADOS_C_API_BASE_DEFAULT(rados_set_pool_full_try);
 
-extern "C" void _rados_unset_pool_full_try(rados_ioctx_t io)
+extern "C" void LIBRADOS_C_API_DEFAULT_F(rados_unset_pool_full_try)(
+  rados_ioctx_t io)
 {
   librados::IoCtxImpl *ctx = (librados::IoCtxImpl *)io;
   ctx->extra_op_flags &= ~CEPH_OSD_FLAG_FULL_TRY;
 }
-LIBRADOS_C_API_BASE_DEFAULT(rados_unset_osdmap_full_try);
+LIBRADOS_C_API_BASE_DEFAULT(rados_unset_pool_full_try);
 
 extern "C" int LIBRADOS_C_API_DEFAULT_F(rados_application_enable)(
   rados_ioctx_t io,