Merge pull request ceph#42212 from wjwithagen/wjw-fix-signal

rgw: Use signaling compatible with POSIX
mihalicyn · Jul 10, 2021 · e0577da · e0577da
2 parents 4dae391 + 9861212
commit e0577da
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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<Completion>{static_cast<Completion*>(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
@@ -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<D3nCacheAioWriteRequest*>(sigval.sival_ptr);