crimson/osd: pg_backend.h doesn't depend on pg.h anymore.

It's not only unnecessary but it also causes a depedency hell.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

diff --git a/src/crimson/osd/pg_backend.h b/src/crimson/osd/pg_backend.h
index d820e9f57d5a6d5c0b89ba2e50a0d3ba125ca60c..c8befbbb6f3fb4c243e9b9b847840972749c5695 100644 (file)
--- a/src/crimson/osd/pg_backend.h
+++ b/src/crimson/osd/pg_backend.h
@@ -12,7 +12,6 @@
 #include "crimson/os/futurized_store.h"
 #include "crimson/os/futurized_collection.h"
 #include "crimson/osd/acked_peers.h"
-#include "crimson/osd/pg.h"
 #include "crimson/common/shared_lru.h"
 #include "messages/MOSDOp.h"
 #include "messages/MOSDOpReply.h"

diff --git a/src/crimson/osd/pg_interval_interrupt_condition.cc b/src/crimson/osd/pg_interval_interrupt_condition.cc
index 8ee8e5d8dbf77ead33b61dd9a06a35dc2553af56..d02eb7f8c0f99d0e6f5341b12321d0b85858690e 100644 (file)
--- a/src/crimson/osd/pg_interval_interrupt_condition.cc
+++ b/src/crimson/osd/pg_interval_interrupt_condition.cc
@@ -11,6 +11,11 @@ namespace crimson::osd {
 IOInterruptCondition::IOInterruptCondition(Ref<PG>& pg)
   : pg(pg), e(pg->get_osdmap_epoch()) {}
 
+IOInterruptCondition::~IOInterruptCondition() {
+  // for the sake of forward declaring PG (which is a detivate of
+  // intrusive_ref_counter<...>)
+}
+
 bool IOInterruptCondition::new_interval_created() {
   bool ret = e < pg->get_interval_start_epoch();
   if (ret)

diff --git a/src/crimson/osd/pg_interval_interrupt_condition.h b/src/crimson/osd/pg_interval_interrupt_condition.h
index 7f62ad108ff14f10380e207b26e0bc7776e66114..687f1d2b4cb661d241db976b95ae5d3ba24997eb 100644 (file)
--- a/src/crimson/osd/pg_interval_interrupt_condition.h
+++ b/src/crimson/osd/pg_interval_interrupt_condition.h
@@ -15,6 +15,7 @@ class PG;
 class IOInterruptCondition {
 public:
   IOInterruptCondition(Ref<PG>& pg);
+  ~IOInterruptCondition();
 
   bool new_interval_created();