From 08281bafcd7b87127b7ec1f3756e6b9fc9441dc3 Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Thu, 9 May 2024 19:11:14 +0000 Subject: [PATCH] osd: move ECCommon::RecoveryBackend from ECBackend.cc to ECCommon.cc Signed-off-by: Radoslaw Zarzynski (cherry picked from commit debd035a650768ead64e0707028bb862f4767bef) --- src/osd/ECBackend.cc | 2 +- src/osd/ECBackend.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc index 3dfaf62bca3..9f69d87ea99 100644 --- 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 0f15094a56d..f951a2f56c4 100644 --- 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; -- 2.47.3