From 28f441317297999c452b6ab6f346fe535aa4f541 Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Mon, 26 Aug 2024 10:18:08 +0000 Subject: [PATCH] crimson/osd/osd_operations/snaptrim_event: make use of process_and_submit Signed-off-by: Matan Breizman --- .../osd/osd_operations/snaptrim_event.cc | 26 ++----------------- 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/src/crimson/osd/osd_operations/snaptrim_event.cc b/src/crimson/osd/osd_operations/snaptrim_event.cc index bb497cc1d3a..15b3a84bf7f 100644 --- a/src/crimson/osd/osd_operations/snaptrim_event.cc +++ b/src/crimson/osd/osd_operations/snaptrim_event.cc @@ -402,30 +402,8 @@ SnapTrimObjSubEvent::start() // lock both clone's and head's obcs co_await pg->obc_loader.with_obc( coid, - [this](auto head_obc, auto clone_obc) -> ObjectContextLoader::load_obc_iertr::future<> { - logger().debug("{}: got clone_obc={}", *this, clone_obc->get_oid()); - - co_await enter_stage(client_pp().process); - - logger().debug("{}: processing clone_obc={}", *this, clone_obc->get_oid()); - - auto txn = co_await remove_or_update(clone_obc, head_obc); - - auto [submitted, all_completed] = co_await pg->submit_transaction( - std::move(clone_obc), - std::move(txn), - std::move(osd_op_p), - std::move(log_entries) - ); - - co_await std::move(submitted); - - co_await enter_stage(client_pp().wait_repop); - - co_await std::move(all_completed); - - co_return; - }, + std::bind(&SnapTrimObjSubEvent::process_and_submit, + this, std::placeholders::_1, std::placeholders::_2), false ).handle_error_interruptible( remove_or_update_iertr::pass_further{}, -- 2.39.5