diff --git a/include/ircd/buffer/buffer.h b/include/ircd/buffer/buffer.h index 9c4130278..4e306e3a2 100644 --- a/include/ircd/buffer/buffer.h +++ b/include/ircd/buffer/buffer.h @@ -197,7 +197,7 @@ ircd::buffer::consume(buffer &b, { assert(!null(b)); assert(bytes <= size(b)); - const auto &advance + const size_t advance { std::min(bytes, size(b)) }; diff --git a/include/ircd/m/fetch.h b/include/ircd/m/fetch.h index e333ba806..bfb0de1f0 100644 --- a/include/ircd/m/fetch.h +++ b/include/ircd/m/fetch.h @@ -151,6 +151,8 @@ struct ircd::m::fetch::result /// instance go out of scope by making this conversion. explicit operator json::object() const; explicit operator json::array() const; + + result() = default; }; /// Fetch entity state. DO NOT CONSTRUCT. This is an internal structure but we diff --git a/ircd/ctx_ole.cc b/ircd/ctx_ole.cc index da19f3bf8..d3d0eb110 100644 --- a/ircd/ctx_ole.cc +++ b/ircd/ctx_ole.cc @@ -12,6 +12,7 @@ namespace ircd::ctx::ole { + static const opts default_opts; extern conf::item thread_max; static std::mutex mutex; @@ -65,8 +66,12 @@ noexcept }); } +// +// ole::offload +// + ircd::ctx::ole::offload::offload(const function &func) -:offload{opts{}, func} +:offload{default_opts, func} { } diff --git a/ircd/fs.cc b/ircd/fs.cc index 524ce02ac..137408938 100644 --- a/ircd/fs.cc +++ b/ircd/fs.cc @@ -831,13 +831,15 @@ ircd::fs::incore(const fd &fd, const size_t &count, const read_opts &opts) { + const fs::opts fs_opts + { + .offset = off_t(align(opts.offset, info::page_size)), + .blocking = false, + }; + const fs::map::opts map_opts { - fs::opts - { - .offset = off_t(align(opts.offset, info::page_size)), - .blocking = false, - }, + { fs_opts }, }; const size_t &map_size @@ -853,7 +855,7 @@ ircd::fs::incore(const fd &fd, assert(map_opts.offset % 4096 == 0); const fs::map map { - fd, map_opts, map_size + fd, map_size, map_opts }; const size_t res