From f776610eeacbc7de97bc691face2043e6013baae Mon Sep 17 00:00:00 2001
From: Matan Breizman <mbreizma@redhat.com>
Date: Mon, 27 Nov 2023 12:11:38 +0000
Subject: [PATCH] crimson/osd/osd_operations/snaptrim_event: using
 snap_trim_*_ret_t

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
---
 src/crimson/osd/osd_operations/snaptrim_event.cc |  8 ++++----
 src/crimson/osd/osd_operations/snaptrim_event.h  | 14 ++++++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/crimson/osd/osd_operations/snaptrim_event.cc b/src/crimson/osd/osd_operations/snaptrim_event.cc
index 01ea2a710c336..a29c57d102c11 100644
--- a/src/crimson/osd/osd_operations/snaptrim_event.cc
+++ b/src/crimson/osd/osd_operations/snaptrim_event.cc
@@ -60,7 +60,7 @@ CommonPGPipeline& SnapTrimEvent::client_pp()
   return pg->request_pg_pipeline;
 }
 
-SnapTrimEvent::snap_trim_ertr::future<seastar::stop_iteration>
+SnapTrimEvent::snap_trim_event_ret_t
 SnapTrimEvent::start()
 {
   ShardServices &shard_services = pg->get_shard_services();
@@ -167,7 +167,7 @@ SnapTrimEvent::start()
         });
       });
     });
-  }, [this](std::exception_ptr eptr) -> snap_trim_ertr::future<seastar::stop_iteration> {
+  }, [this](std::exception_ptr eptr) -> snap_trim_event_ret_t {
     logger().debug("{}: interrupted {}", *this, eptr);
     return crimson::ct_error::eagain::make();
   }, pg).finally([this] {
@@ -184,7 +184,7 @@ CommonPGPipeline& SnapTrimObjSubEvent::client_pp()
   return pg->request_pg_pipeline;
 }
 
-SnapTrimObjSubEvent::remove_or_update_iertr::future<>
+SnapTrimObjSubEvent::snap_trim_obj_subevent_ret_t
 SnapTrimObjSubEvent::remove_clone(
   ObjectContextRef obc,
   ObjectContextRef head_obc,
@@ -431,7 +431,7 @@ SnapTrimObjSubEvent::remove_or_update(
   });
 }
 
-SnapTrimObjSubEvent::remove_or_update_iertr::future<>
+SnapTrimObjSubEvent::snap_trim_obj_subevent_ret_t
 SnapTrimObjSubEvent::start()
 {
   return enter_stage<interruptor>(
diff --git a/src/crimson/osd/osd_operations/snaptrim_event.h b/src/crimson/osd/osd_operations/snaptrim_event.h
index 0548b396a0751..01cd82a245a7d 100644
--- a/src/crimson/osd/osd_operations/snaptrim_event.h
+++ b/src/crimson/osd/osd_operations/snaptrim_event.h
@@ -39,6 +39,10 @@ public:
     crimson::ct_error::eagain>;
   using snap_trim_iertr = remove_or_update_iertr::extend<
     crimson::ct_error::eagain>;
+  using snap_trim_event_ret_t =
+    snap_trim_ertr::future<seastar::stop_iteration>;
+  using snap_trim_obj_subevent_ret_t =
+      remove_or_update_iertr::future<>;
 
   static constexpr OperationTypeCode type = OperationTypeCode::snaptrim_event;
 
@@ -53,12 +57,12 @@ public:
 
   void print(std::ostream &) const final;
   void dump_detail(ceph::Formatter* f) const final;
-  snap_trim_ertr::future<seastar::stop_iteration> start();
+  snap_trim_event_ret_t start();
 
 private:
   CommonPGPipeline& client_pp();
 
-  SubOpBlocker<remove_or_update_iertr::future<>> subop_blocker;
+  SubOpBlocker<snap_trim_obj_subevent_ret_t> subop_blocker;
 
   // we don't need to synchronize with other instances of SnapTrimEvent;
   // it's here for the sake of op tracking.
@@ -108,6 +112,8 @@ public:
   using remove_or_update_iertr =
     crimson::interruptible::interruptible_errorator<
       IOInterruptCondition, remove_or_update_ertr>;
+  using snap_trim_obj_subevent_ret_t =
+      remove_or_update_iertr::future<>;
 
   static constexpr OperationTypeCode type =
     OperationTypeCode::snaptrimobj_subevent;
@@ -123,7 +129,7 @@ public:
 
   void print(std::ostream &) const final;
   void dump_detail(ceph::Formatter* f) const final;
-  remove_or_update_iertr::future<> start();
+  snap_trim_obj_subevent_ret_t start();
 
   CommonPGPipeline& client_pp();
 
@@ -132,7 +138,7 @@ private:
    * https://tracker.ceph.com/issues/63307 */
   object_stat_sum_t delta_stats;
 
-  remove_or_update_iertr::future<> remove_clone(
+  snap_trim_obj_subevent_ret_t remove_clone(
     ObjectContextRef obc,
     ObjectContextRef head_obc,
     ceph::os::Transaction& txn);
-- 
2.39.5