osd: move ECCommon::RecoveryBackend from ECBackend.cc to ECCommon.cc

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

diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
index 3dfaf62bca35269116dbe5c108c5d5cdc8e7b8b0..9f69d87ea99e975e5f57bbdce41e2e28bbeaacec 100644 (file)
--- a/src/osd/ECBackend.cc
+++ b/src/osd/ECBackend.cc
@@ -59,7 +59,7 @@ static ostream &_prefix(std::ostream *_dout, ECBackend *pgb) {
   return pgb->get_parent()->gen_dbg_prefix(*_dout);
 }
 
-static ostream& _prefix(std::ostream *_dout, ECBackend::RecoveryBackend *pgb) {
+static ostream& _prefix(std::ostream *_dout, ECBackend::ECRecoveryBackend *pgb) {
   return pgb->get_parent()->gen_dbg_prefix(*_dout);
 }
 

diff --git a/src/osd/ECBackend.h b/src/osd/ECBackend.h
index 0f15094a56dceacc7ee89eaa9bbfd942102217f6..f951a2f56c444407afc80de89f1b200231acc43b 100644 (file)
--- a/src/osd/ECBackend.h
+++ b/src/osd/ECBackend.h
@@ -180,6 +180,7 @@ class ECBackend : public ECCommon {
 
   void kick_reads();
 
+public:
   struct ECRecoveryBackend : RecoveryBackend {
     ECRecoveryBackend(CephContext *cct,
                       const coll_t &coll,
@@ -214,8 +215,8 @@ class ECBackend : public ECCommon {
     PGBackend::Listener *parent;
   };
 
-  friend ostream &operator<<(ostream &lhs,
-                             const RecoveryBackend::RecoveryOp &rhs
+  friend std::ostream &operator<<(std::ostream &lhs,
+                                  const RecoveryBackend::RecoveryOp &rhs
     );
   friend struct RecoveryMessages;
   friend struct OnRecoveryReadComplete;