From 7da35f1491d53e23b2e80a1f4a3d610f7985e2b2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rados=C5=82aw=20Zarzy=C5=84ski?= <rzarzyns@redhat.com>
Date: Wed, 27 Sep 2023 14:17:06 +0200
Subject: [PATCH] osd: just shuffle RecoveryMessages to ECCommon.h

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit bc28c16a9a83b0f12d3d6463eaeacbab40b0890b)
---
 src/osd/ECBackend.cc | 14 --------------
 src/osd/ECCommon.h   | 39 +++++++++++++++++++++++++++------------
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
index 297264c6bac6d..7bc6b28649a87 100644
--- a/src/osd/ECBackend.cc
+++ b/src/osd/ECBackend.cc
@@ -142,20 +142,6 @@ void ECBackend::RecoveryBackend::_failed_push(const hobject_t &hoid,
   get_parent()->on_failed_pull(fl, hoid, v);
 }
 
-struct RecoveryMessages {
-  std::map<hobject_t, ECCommon::read_request_t> recovery_reads;
-
-  void recovery_read(const hobject_t &hoid,
-                     const ECCommon::read_request_t &read_request) {
-    ceph_assert(!recovery_reads.count(hoid));
-    recovery_reads.insert(std::make_pair(hoid, read_request));
-  }
-
-  std::map<pg_shard_t, std::vector<PushOp>> pushes;
-  std::map<pg_shard_t, std::vector<PushReplyOp>> push_replies;
-  ceph::os::Transaction t;
-};
-
 void ECBackend::handle_recovery_push(
   const PushOp &op,
   RecoveryMessages *m,
diff --git a/src/osd/ECCommon.h b/src/osd/ECCommon.h
index 59c3d78de0cbe..dc1496b255723 100644
--- a/src/osd/ECCommon.h
+++ b/src/osd/ECCommon.h
@@ -798,6 +798,33 @@ struct ECCommon {
 
 };
 
+struct RecoveryMessages {
+  std::map<hobject_t, ECCommon::read_request_t> recovery_reads;
+
+  void recovery_read(const hobject_t &hoid,
+                     const ECCommon::read_request_t &read_request) {
+    ceph_assert(!recovery_reads.count(hoid));
+    recovery_reads.insert(std::make_pair(hoid, read_request));
+  }
+
+  std::map<pg_shard_t, std::vector<PushOp>> pushes;
+  std::map<pg_shard_t, std::vector<PushReplyOp>> push_replies;
+  ceph::os::Transaction t;
+};
+
+template <>
+struct fmt::formatter<ECCommon::read_request_t> : fmt::ostream_formatter {};
+
+template <>
+struct fmt::formatter<ECCommon::read_result_t> : fmt::ostream_formatter {};
+
+template <>
+struct fmt::formatter<ECCommon::ReadOp> : fmt::ostream_formatter {};
+
+template <>
+struct fmt::formatter<ECCommon::RMWPipeline::Op> : fmt::ostream_formatter {};
+
+
 template <class F, class G>
 void ECCommon::ReadPipeline::check_recovery_sources(
     const OSDMapRef &osdmap,
@@ -886,15 +913,3 @@ void ECCommon::ReadPipeline::filter_read_op(
     on_schedule_recovery(op);
   }
 }
-
-template <>
-struct fmt::formatter<ECCommon::read_request_t> : fmt::ostream_formatter {};
-
-template <>
-struct fmt::formatter<ECCommon::read_result_t> : fmt::ostream_formatter {};
-
-template <>
-struct fmt::formatter<ECCommon::ReadOp> : fmt::ostream_formatter {};
-
-template <>
-struct fmt::formatter<ECCommon::RMWPipeline::Op> : fmt::ostream_formatter {};
-- 
2.39.5