From 1c760fcb587cc44ab464bb53f01d905284081100 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rados=C5=82aw=20Zarzy=C5=84ski?= <rzarzyns@redhat.com>
Date: Wed, 13 Apr 2022 09:10:24 +0200
Subject: [PATCH] crimson/osd: pg_map.h doesn't pull pg.h anymore
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>
---
 .../osd/osd_operations/background_recovery.cc        | 12 ++++++++++++
 src/crimson/osd/osd_operations/background_recovery.h |  5 +----
 .../osd/osd_operations/recovery_subrequest.cc        |  1 +
 src/crimson/osd/pg_map.h                             |  1 -
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/crimson/osd/osd_operations/background_recovery.cc b/src/crimson/osd/osd_operations/background_recovery.cc
index c47a39aae3c69..a340a58a7d085 100644
--- a/src/crimson/osd/osd_operations/background_recovery.cc
+++ b/src/crimson/osd/osd_operations/background_recovery.cc
@@ -75,6 +75,18 @@ seastar::future<> BackgroundRecovery::start()
   });
 }
 
+UrgentRecovery::UrgentRecovery(
+    const hobject_t& soid,
+    const eversion_t& need,
+    Ref<PG> pg,
+    ShardServices& ss,
+    epoch_t epoch_started)
+  : BackgroundRecovery{pg, ss, epoch_started,
+                       crimson::osd::scheduler::scheduler_class_t::immediate},
+    soid{soid}, need(need)
+{
+}
+
 UrgentRecovery::interruptible_future<bool>
 UrgentRecovery::do_recovery()
 {
diff --git a/src/crimson/osd/osd_operations/background_recovery.h b/src/crimson/osd/osd_operations/background_recovery.h
index 98b357dc0c1b3..514a103c581c3 100644
--- a/src/crimson/osd/osd_operations/background_recovery.h
+++ b/src/crimson/osd/osd_operations/background_recovery.h
@@ -60,10 +60,7 @@ public:
     const eversion_t& need,
     Ref<PG> pg,
     ShardServices& ss,
-    epoch_t epoch_started)
-  : BackgroundRecovery{pg, ss, epoch_started,
-                       crimson::osd::scheduler::scheduler_class_t::immediate},
-    soid{soid}, need(need) {}
+    epoch_t epoch_started);
   void print(std::ostream&) const final;
 
 private:
diff --git a/src/crimson/osd/osd_operations/recovery_subrequest.cc b/src/crimson/osd/osd_operations/recovery_subrequest.cc
index df003f7e6b63e..10546db3a9a3e 100644
--- a/src/crimson/osd/osd_operations/recovery_subrequest.cc
+++ b/src/crimson/osd/osd_operations/recovery_subrequest.cc
@@ -2,6 +2,7 @@
 #include <fmt/ostream.h>
 
 #include "crimson/osd/osd_operations/recovery_subrequest.h"
+#include "crimson/osd/pg.h"
 
 namespace {
   seastar::logger& logger() {
diff --git a/src/crimson/osd/pg_map.h b/src/crimson/osd/pg_map.h
index b3fe4b562db03..bef82edbca6f2 100644
--- a/src/crimson/osd/pg_map.h
+++ b/src/crimson/osd/pg_map.h
@@ -11,7 +11,6 @@
 #include "include/types.h"
 #include "crimson/common/type_helpers.h"
 #include "crimson/osd/osd_operation.h"
-#include "crimson/osd/pg.h"
 #include "osd/osd_types.h"
 
 namespace crimson::osd {
-- 
2.39.5