From 179d4cbca6d3c90f761f163ef36dcd4c5425665a Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Thu, 22 Jan 2026 01:33:54 -0500 Subject: [PATCH] osd/Session: Move `Backoff` constructor to `Session.cc` Clang 21 is more strict about what phase things have to be available in. We move the constructor out of the header so the `intrusive_ptr` free functions are available. Signed-off-by: Adam C. Emerson --- src/osd/Session.cc | 11 +++++++++++ src/osd/Session.h | 9 +-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/osd/Session.cc b/src/osd/Session.cc index b68ec31c0d83..1c0f9888558a 100644 --- a/src/osd/Session.cc +++ b/src/osd/Session.cc @@ -12,6 +12,17 @@ using std::map; using std::set; +Backoff::Backoff(spg_t pgid, PGRef pg, ceph::ref_t s, + uint64_t i, + const hobject_t& b, const hobject_t& e) +: RefCountedObject(g_ceph_context), + pgid(pgid), + id(i), + pg(pg), + session(std::move(s)), + begin(b), + end(e) {} + void Session::clear_backoffs() { map>>> ls; diff --git a/src/osd/Session.h b/src/osd/Session.h index 27178a31ceaf..05ffef209219 100644 --- a/src/osd/Session.h +++ b/src/osd/Session.h @@ -116,14 +116,7 @@ private: FRIEND_MAKE_REF(Backoff); Backoff(spg_t pgid, PGRef pg, ceph::ref_t s, uint64_t i, - const hobject_t& b, const hobject_t& e) - : RefCountedObject(g_ceph_context), - pgid(pgid), - id(i), - pg(pg), - session(std::move(s)), - begin(b), - end(e) {} + const hobject_t& b, const hobject_t& e); }; -- 2.47.3