From 6ed1a6306fd3fa41d11a86641be39c97fc5aa473 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rados=C5=82aw=20Zarzy=C5=84ski?= Date: Wed, 13 Sep 2023 18:20:31 +0200 Subject: [PATCH] osd: ReadPipeline doesn't depend on ECBackend anymore MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Radosław Zarzyński --- src/osd/ECBackend.cc | 2 +- src/osd/ECBackend.h | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc index 386c1eeabe32a..d72751c4c36c4 100644 --- a/src/osd/ECBackend.cc +++ b/src/osd/ECBackend.cc @@ -224,7 +224,7 @@ ECBackend::ECBackend( ErasureCodeInterfaceRef ec_impl, uint64_t stripe_width) : PGBackend(cct, pg, store, coll, ch), - read_pipeline(cct, ec_impl, this->sinfo, get_parent(), *this), + read_pipeline(cct, ec_impl, this->sinfo, get_parent()), rmw_pipeline(cct, ec_impl, this->sinfo, get_parent(), *this), ec_impl(ec_impl), sinfo(ec_impl->get_data_chunk_count(), stripe_width) { diff --git a/src/osd/ECBackend.h b/src/osd/ECBackend.h index b859414160bd7..85e7a5b915958 100644 --- a/src/osd/ECBackend.h +++ b/src/osd/ECBackend.h @@ -445,9 +445,8 @@ public: CephContext* cct; ceph::ErasureCodeInterfaceRef ec_impl; const ECUtil::stripe_info_t& sinfo; - PGBackend::Listener* parent; // TODO: lay an interface down here - ECBackend& ec_backend; + PGBackend::Listener* parent; PGBackend::Listener *get_parent() const { return parent; } const OSDMapRef& get_osdmap() const { return get_parent()->pgb_get_osdmap(); } @@ -457,13 +456,11 @@ public: ReadPipeline(CephContext* cct, ceph::ErasureCodeInterfaceRef ec_impl, const ECUtil::stripe_info_t& sinfo, - PGBackend::Listener* parent, - ECBackend& ec_backend) + PGBackend::Listener* parent) : cct(cct), ec_impl(std::move(ec_impl)), sinfo(sinfo), - parent(parent), - ec_backend(ec_backend) { + parent(parent) { } int get_remaining_shards( -- 2.39.5