From 36fd68c96653e83f87767feb08530a9fc6e841b0 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Fri, 20 May 2016 13:58:32 -0700 Subject: [PATCH] osd: CLEANUP: Remove unused pending_read member Remove unused struct Signed-off-by: David Zafman --- src/osd/ECBackend.cc | 2 -- src/osd/ECBackend.h | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc index b9f2f6157578f..a7303d4c98bc5 100644 --- a/src/osd/ECBackend.cc +++ b/src/osd/ECBackend.cc @@ -147,7 +147,6 @@ ostream &operator<<(ostream &lhs, const ECBackend::RecoveryOp &rhs) << " missing_on_shards=" << rhs.missing_on_shards << " recovery_info=" << rhs.recovery_info << " recovery_progress=" << rhs.recovery_progress - << " pending_read=" << rhs.pending_read << " obc refcount=" << rhs.obc.use_count() << " state=" << ECBackend::RecoveryOp::tostr(rhs.state) << " waiting_on_pushes=" << rhs.waiting_on_pushes @@ -163,7 +162,6 @@ void ECBackend::RecoveryOp::dump(Formatter *f) const f->dump_stream("missing_on_shards") << missing_on_shards; f->dump_stream("recovery_info") << recovery_info; f->dump_stream("recovery_progress") << recovery_progress; - f->dump_bool("pending_read", pending_read); f->dump_stream("state") << tostr(state); f->dump_stream("waiting_on_pushes") << waiting_on_pushes; f->dump_stream("extent_requested") << extent_requested; diff --git a/src/osd/ECBackend.h b/src/osd/ECBackend.h index ac937feab9a28..f9b48f659a885 100644 --- a/src/osd/ECBackend.h +++ b/src/osd/ECBackend.h @@ -202,7 +202,6 @@ private: ObjectRecoveryInfo recovery_info; ObjectRecoveryProgress recovery_progress; - bool pending_read; enum state_t { IDLE, READING, WRITING, COMPLETE } state; static const char* tostr(state_t state) { @@ -237,7 +236,7 @@ private: void dump(Formatter *f) const; - RecoveryOp() : pending_read(false), state(IDLE) {} + RecoveryOp() : state(IDLE) {} }; friend ostream &operator<<(ostream &lhs, const RecoveryOp &rhs); map recovery_ops; -- 2.39.5