osd: ReadPipeline doesn't depend on ECBackend anymore

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

diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
index 386c1eeabe32a037d50c2bf10f97fe768e4b2648..d72751c4c36c484f9e1c157c5195ccbaef6517f4 100644 (file)
--- 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 b859414160bd7209a96b0bc9285a387910941adc..85e7a5b91595836610d2afb3b1f25959e989d173 100644 (file)
--- 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(