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

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

diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
index d27aa8a62e8d4eaecccc3f409bfbe4fafac84738..b812f6d09f6bc32db7eca4939036f0d1bec4062c 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 087a702ac88c745e4acc9a9db2d96b76c59ff011..1139e0443752da0926dd0d93c4c5ebe1cf99b5b0 100644 (file)
--- a/src/osd/ECBackend.h
+++ b/src/osd/ECBackend.h
@@ -186,6 +186,7 @@ class ECBackend : public ECCommon {
 
   void kick_reads();
 
+public:
   struct ECRecoveryBackend : RecoveryBackend {
     ECRecoveryBackend(CephContext *cct,
                       const coll_t &coll,
@@ -220,8 +221,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;