osd: ECCommon::RecoveryBackend doesn't depend on ECBackend anymore

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

diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
index 71e7ab256438f7f3503d3cbd0939d7ea610992fa..0d189e4f1a9bc838a00886a19c3e54dc1618453f 100644 (file)
--- 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 27f83e04c5652f6f80425ab2b3406409eadb00c8..cf70699243798070781b8596055352efb10bab14 100644 (file)
--- a/src/osd/ECBackend.h
+++ b/src/osd/ECBackend.h
@@ -193,9 +193,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 c4726bff42e0974ab281f565b3cce206043def82..5551eeecb7f80f3e2f2e2eb6950de5a242366935 100644 (file)
--- a/src/osd/ECCommon.h
+++ b/src/osd/ECCommon.h
@@ -684,7 +684,6 @@ struct ECCommon {
     ReadPipeline &read_pipeline;
     // TODO: lay an interface down here
     ECListener *parent;
-    ECBackend *ecbackend;
 
     ECListener *get_parent() const { return parent; }
 
@@ -708,8 +707,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;