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

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit 6ead960b23a95211847250d90e3d2945c6254345)

diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
index 5e4f426925aa99e03dd5dca628f85ea4bdfef4cf..1233d862f1c9c04294625290fa098fc3b50a5667 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 94b24d541c89aecb2a02d73f09a3889df8e5c170..a094477a959d20ad7d182683bbe2b962d88c5d44 100644 (file)
--- 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 6a75c20d7a637e843589f11a6e9a4caf388fc26d..59c3d78de0cbee967e0cee342456f6720dbb4143 100644 (file)
--- 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;