From 98612126696c65de0ff86aa071c3881a8d85272b Mon Sep 17 00:00:00 2001 From: Willem Jan Withagen Date: Wed, 7 Jul 2021 12:51:12 +0200 Subject: [PATCH] rgw: Use signaling compatible with POSIX FreeBSD does not have signal_t. Linux specifies also to use `sigval` as POSIX compliant. tracker: https://tracker.ceph.com/issues/51610 fixes: https://github.com/ceph/ceph/pull/36266 Signed-off-by: Willem Jan Withagen --- src/rgw/rgw_d3n_cacherequest.h | 2 +- src/rgw/rgw_d3n_datacache.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_d3n_cacherequest.h b/src/rgw/rgw_d3n_cacherequest.h index 1825d0cb0ff1..41e026bcd345 100644 --- a/src/rgw/rgw_d3n_cacherequest.h +++ b/src/rgw/rgw_d3n_cacherequest.h @@ -76,7 +76,7 @@ struct D3nL1CacheRequest { return 0; } - static void libaio_cb_aio_dispatch(sigval_t sigval) { + static void libaio_cb_aio_dispatch(sigval sigval) { lsubdout(g_ceph_context, rgw_datacache, 20) << "D3nDataCache: " << __func__ << "()" << dendl; auto p = std::unique_ptr{static_cast(sigval.sival_ptr)}; auto op = std::move(p->user_data); diff --git a/src/rgw/rgw_d3n_datacache.cc b/src/rgw/rgw_d3n_datacache.cc index 37012e5455c3..e2ad497dae97 100644 --- a/src/rgw/rgw_d3n_datacache.cc +++ b/src/rgw/rgw_d3n_datacache.cc @@ -144,7 +144,7 @@ int D3nDataCache::d3n_io_write(bufferlist& bl, unsigned int len, std::string oid return r; } -void d3n_libaio_write_cb(sigval_t sigval) +void d3n_libaio_write_cb(sigval sigval) { lsubdout(g_ceph_context, rgw_datacache, 30) << "D3nDataCache: " << __func__ << "()" << dendl; D3nCacheAioWriteRequest* c = static_cast(sigval.sival_ptr); -- 2.47.3