From f384a5dc344bfc8055b909be3ee0b64e32a50f2e Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Mon, 29 Mar 2021 18:41:10 +0000 Subject: [PATCH] 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 --- src/crimson/osd/pg_backend.h | 1 - src/crimson/osd/pg_interval_interrupt_condition.cc | 5 +++++ src/crimson/osd/pg_interval_interrupt_condition.h | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/crimson/osd/pg_backend.h b/src/crimson/osd/pg_backend.h index d820e9f57d5..c8befbbb6f3 100644 --- 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 8ee8e5d8dbf..d02eb7f8c0f 100644 --- 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), 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 7f62ad108ff..687f1d2b4cb 100644 --- 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); + ~IOInterruptCondition(); bool new_interval_created(); -- 2.39.5