crimson/osd: pg_map.h doesn't pull pg.h anymore

Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>

diff --git a/src/crimson/osd/osd_operations/background_recovery.cc b/src/crimson/osd/osd_operations/background_recovery.cc
index c47a39aae3c694d5bf0f0e56f1166c74b4763c80..a340a58a7d0858a3bb33a9484c9522b431191f2a 100644 (file)
--- 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 98b357dc0c1b3f491696bb6e5d745625470cdad7..514a103c581c378d7f0e756c829137a48918548b 100644 (file)
--- 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 df003f7e6b63e5be74064a77e4c70a23784f73b1..10546db3a9a3ed2cbf1b6fd88f6751b2e9df7b6c 100644 (file)
--- 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 b3fe4b562db03d4190db8ab65ccbd51c325e0502..bef82edbca6f2a0192c78c5d3fa7f21e777a1595 100644 (file)
--- 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 {