From ea581fafe70b51567b1c80fa1d608e5ef42f4261 Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Mon, 25 Mar 2024 13:02:07 +0000 Subject: [PATCH] osd: ECCommon::RecoveryBackend doesn't depend on ECBackend anymore Signed-off-by: Radoslaw Zarzynski (cherry picked from commit 6ead960b23a95211847250d90e3d2945c6254345) --- src/osd/ECBackend.cc | 6 ++---- src/osd/ECBackend.h | 4 ++-- src/osd/ECCommon.h | 4 +--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc index 5e4f426925a..1233d862f1c 100644 --- a/src/osd/ECBackend.cc +++ b/src/osd/ECBackend.cc @@ -113,15 +113,13 @@ ECBackend::RecoveryBackend::RecoveryBackend( ceph::ErasureCodeInterfaceRef ec_impl, const ECUtil::stripe_info_t &sinfo, ReadPipeline &read_pipeline, - ECListener *parent, - ECBackend *ecbackend) + ECListener *parent) : cct(cct), coll(coll), ec_impl(std::move(ec_impl)), sinfo(sinfo), read_pipeline(read_pipeline), - parent(parent), - ecbackend(ecbackend) {} + parent(parent) {} ECCommon::RecoveryBackend::ECRecoveryHandle *ECBackend::RecoveryBackend::open_recovery_op() { return new ECRecoveryHandle; diff --git a/src/osd/ECBackend.h b/src/osd/ECBackend.h index 94b24d541c8..a094477a959 100644 --- a/src/osd/ECBackend.h +++ b/src/osd/ECBackend.h @@ -187,9 +187,9 @@ class ECBackend : public ECCommon { const ECUtil::stripe_info_t &sinfo, ReadPipeline &read_pipeline, PGBackend::Listener *parent, - ECBackend *ecbackend) + ECBackend *) : RecoveryBackend(cct, coll, std::move(ec_impl), sinfo, read_pipeline, - parent->get_eclistener(), ecbackend), + parent->get_eclistener()), parent(parent) {} void commit_txn_send_replies( diff --git a/src/osd/ECCommon.h b/src/osd/ECCommon.h index 6a75c20d7a6..59c3d78de0c 100644 --- a/src/osd/ECCommon.h +++ b/src/osd/ECCommon.h @@ -671,7 +671,6 @@ struct ECCommon { ReadPipeline &read_pipeline; // TODO: lay an interface down here ECListener *parent; - ECBackend *ecbackend; ECListener *get_parent() const { return parent; } @@ -695,8 +694,7 @@ struct ECCommon { ceph::ErasureCodeInterfaceRef ec_impl, const ECUtil::stripe_info_t &sinfo, ReadPipeline &read_pipeline, - ECListener *parent, - ECBackend *ecbackend); + ECListener *parent); struct RecoveryOp { hobject_t hoid; -- 2.39.5