From e5aeade8f2ef3bf2fe7aa9c000c18e7a7e73d4ee Mon Sep 17 00:00:00 2001
From: Matan Breizman <mbreizma@redhat.com>
Date: Wed, 25 Oct 2023 13:06:13 +0000
Subject: [PATCH] crimson/osd: remove do_osd_ops_success_func_t and
 do_osd_ops_failure_func_t

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
---
 .../osd/osd_operations/internal_client_request.cc  | 10 +---------
 src/crimson/osd/pg.cc                              | 14 +++++++++-----
 src/crimson/osd/pg.h                               |  9 ++-------
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/crimson/osd/osd_operations/internal_client_request.cc b/src/crimson/osd/osd_operations/internal_client_request.cc
index c2a371d274f..ea45e92c148 100644
--- a/src/crimson/osd/osd_operations/internal_client_request.cc
+++ b/src/crimson/osd/osd_operations/internal_client_request.cc
@@ -93,15 +93,7 @@ seastar::future<> InternalClientRequest::start()
                   std::move(obc),
                   osd_ops,
                   std::as_const(op_info),
-                  get_do_osd_ops_params(),
-                  // success_func
-                  [] {
-                    return PG::do_osd_ops_iertr::now();
-                  },
-                  // failure_func
-                  [] (const std::error_code& e) {
-                    return PG::do_osd_ops_iertr::now();
-                  }
+                  get_do_osd_ops_params()
                 ).safe_then_unpack_interruptible(
                   [](auto submitted, auto all_completed) {
                     return all_completed.handle_error_interruptible(
diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index 78ae559e8cd..84a944533b9 100644
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -1114,9 +1114,7 @@ PG::do_osd_ops(
   ObjectContextRef obc,
   std::vector<OSDOp>& ops,
   const OpInfo &op_info,
-  const do_osd_ops_params_t &&msg_params,
-  do_osd_ops_success_func_t success_func,
-  do_osd_ops_failure_func_t failure_func)
+  const do_osd_ops_params_t &&msg_params)
 {
   // This overload is generally used for internal client requests,
   // use an empty SnapContext.
@@ -1133,8 +1131,14 @@ PG::do_osd_ops(
         SnapContext{}
       ),
       ops,
-      std::move(success_func),
-      std::move(failure_func));
+      // success_func
+      [] {
+        return do_osd_ops_iertr::now();
+      },
+      // failure_func
+      [] (const std::error_code& e) {
+        return do_osd_ops_iertr::now();
+      });
   });
 }
 
diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h
index 6a0231e452f..e06df874b89 100644
--- a/src/crimson/osd/pg.h
+++ b/src/crimson/osd/pg.h
@@ -571,10 +571,7 @@ private:
     ObjectContextRef obc,
     const OpInfo &op_info,
     const SnapContext& snapc);
-  using do_osd_ops_success_func_t =
-    std::function<do_osd_ops_iertr::future<>()>;
-  using do_osd_ops_failure_func_t =
-    std::function<do_osd_ops_iertr::future<>(const std::error_code&)>;
+
   struct do_osd_ops_params_t;
   do_osd_ops_iertr::future<MURef<MOSDOpReply>> log_reply(
     Ref<MOSDOp> m,
@@ -583,9 +580,7 @@ private:
     ObjectContextRef obc,
     std::vector<OSDOp>& ops,
     const OpInfo &op_info,
-    const do_osd_ops_params_t &&params,
-    do_osd_ops_success_func_t success_func,
-    do_osd_ops_failure_func_t failure_func);
+    const do_osd_ops_params_t &&params);
   template <class Ret, class SuccessFunc, class FailureFunc>
   do_osd_ops_iertr::future<pg_rep_op_fut_t<Ret>> do_osd_ops_execute(
     seastar::lw_shared_ptr<OpsExecuter> ox,
-- 
2.39.5