From 7961b3714d927eecd6eb3bb38ebd452e5d0bc9cd Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Sat, 26 Oct 2024 15:44:57 -0700 Subject: [PATCH] crimson/osd/object_context_loader.cc: retab remaining methods Signed-off-by: Samuel Just --- src/crimson/osd/object_context_loader.cc | 64 ++++++++++++------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/src/crimson/osd/object_context_loader.cc b/src/crimson/osd/object_context_loader.cc index d0bdd441023..869ca91504c 100644 --- a/src/crimson/osd/object_context_loader.cc +++ b/src/crimson/osd/object_context_loader.cc @@ -123,41 +123,41 @@ ObjectContextLoader::load_and_lock(Manager &manager, RWState::State lock_type) } } - ObjectContextLoader::load_obc_iertr::future<> - ObjectContextLoader::load_obc(ObjectContextRef obc) - { - LOG_PREFIX(ObjectContextLoader::load_obc); - return backend.load_metadata(obc->get_oid()) +ObjectContextLoader::load_obc_iertr::future<> +ObjectContextLoader::load_obc(ObjectContextRef obc) +{ + LOG_PREFIX(ObjectContextLoader::load_obc); + return backend.load_metadata(obc->get_oid()) .safe_then_interruptible( [FNAME, this, obc=std::move(obc)](auto md) -> load_obc_ertr::future<> { - const hobject_t& oid = md->os.oi.soid; - DEBUGDPP("loaded obs {} for {}", dpp, md->os.oi, oid); - if (oid.is_head()) { - if (!md->ssc) { - ERRORDPP("oid {} missing snapsetcontext", dpp, oid); - return crimson::ct_error::object_corrupted::make(); - } - obc->set_head_state(std::move(md->os), - std::move(md->ssc)); - } else { - // we load and set the ssc only for head obc. - // For clones, the head's ssc will be referenced later. - // See set_clone_ssc - obc->set_clone_state(std::move(md->os)); - } - DEBUGDPP("loaded obc {} for {}", dpp, obc->obs.oi, obc->obs.oi.soid); - return seastar::now(); - }); - } + const hobject_t& oid = md->os.oi.soid; + DEBUGDPP("loaded obs {} for {}", dpp, md->os.oi, oid); + if (oid.is_head()) { + if (!md->ssc) { + ERRORDPP("oid {} missing snapsetcontext", dpp, oid); + return crimson::ct_error::object_corrupted::make(); + } + obc->set_head_state(std::move(md->os), + std::move(md->ssc)); + } else { + // we load and set the ssc only for head obc. + // For clones, the head's ssc will be referenced later. + // See set_clone_ssc + obc->set_clone_state(std::move(md->os)); + } + DEBUGDPP("loaded obc {} for {}", dpp, obc->obs.oi, obc->obs.oi.soid); + return seastar::now(); + }); +} - void ObjectContextLoader::notify_on_change(bool is_primary) - { - LOG_PREFIX(ObjectContextLoader::notify_on_change); - DEBUGDPP("is_primary: {}", dpp, is_primary); - for (auto& obc : obc_set_accessing) { - DEBUGDPP("interrupting obc: {}", dpp, obc.get_oid()); - obc.interrupt(::crimson::common::actingset_changed(is_primary)); - } +void ObjectContextLoader::notify_on_change(bool is_primary) +{ + LOG_PREFIX(ObjectContextLoader::notify_on_change); + DEBUGDPP("is_primary: {}", dpp, is_primary); + for (auto& obc : obc_set_accessing) { + DEBUGDPP("interrupting obc: {}", dpp, obc.get_oid()); + obc.interrupt(::crimson::common::actingset_changed(is_primary)); } } +}