From d79efb024cb6788a95885160bdd0d3a256f439f2 Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Tue, 3 Aug 2021 09:26:16 +0200 Subject: [PATCH] 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 --- src/librados/librados_c.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/librados/librados_c.cc b/src/librados/librados_c.cc index ae4a0e9dbb505..cc6a31f8dc1c7 100644 --- a/src/librados/librados_c.cc +++ b/src/librados/librados_c.cc @@ -530,21 +530,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, -- 2.39.5