From 076e94d0ca1afb5a4d77f5183708a531d93289f1 Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Wed, 27 Sep 2017 13:51:19 +0800 Subject: [PATCH] osd/osd_types: kill osd_peer_stat_t Which currently has no more consumers. Signed-off-by: xie xingguo --- src/osd/osd_types.cc | 34 ---------------------------------- src/osd/osd_types.h | 17 ----------------- src/test/encoding/types.h | 1 - 3 files changed, 52 deletions(-) diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc index 7948e796af9..95fea10a1a1 100644 --- a/src/osd/osd_types.cc +++ b/src/osd/osd_types.cc @@ -4529,40 +4529,6 @@ void pg_hit_set_history_t::generate_test_instances(list& ls.back()->history.push_back(pg_hit_set_info_t()); } -// -- osd_peer_stat_t -- - -void osd_peer_stat_t::encode(bufferlist& bl) const -{ - ENCODE_START(1, 1, bl); - ::encode(stamp, bl); - ENCODE_FINISH(bl); -} - -void osd_peer_stat_t::decode(bufferlist::iterator& bl) -{ - DECODE_START(1, bl); - ::decode(stamp, bl); - DECODE_FINISH(bl); -} - -void osd_peer_stat_t::dump(Formatter *f) const -{ - f->dump_stream("stamp") << stamp; -} - -void osd_peer_stat_t::generate_test_instances(list& o) -{ - o.push_back(new osd_peer_stat_t); - o.push_back(new osd_peer_stat_t); - o.back()->stamp = utime_t(1, 2); -} - -ostream& operator<<(ostream& out, const osd_peer_stat_t &stat) -{ - return out << "stat(" << stat.stamp << ")"; -} - - // -- OSDSuperblock -- void OSDSuperblock::encode(bufferlist &bl) const diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index 48f09ade730..0c6f2db2796 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -4339,23 +4339,6 @@ struct pg_create_t { }; WRITE_CLASS_ENCODER(pg_create_t) -// ----------------------------------------- - -struct osd_peer_stat_t { - utime_t stamp; - - osd_peer_stat_t() { } - - void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bl); - void dump(Formatter *f) const; - static void generate_test_instances(list& o); -}; -WRITE_CLASS_ENCODER(osd_peer_stat_t) - -ostream& operator<<(ostream& out, const osd_peer_stat_t &stat); - - // ----------------------------------------- class ObjectExtent { diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h index a0105eec731..092dd40322d 100644 --- a/src/test/encoding/types.h +++ b/src/test/encoding/types.h @@ -89,7 +89,6 @@ TYPE(ScrubMap::object) TYPE(ScrubMap) TYPE(pg_hit_set_info_t) TYPE(pg_hit_set_history_t) -TYPE(osd_peer_stat_t) TYPE(clone_info) TYPE(obj_list_snap_response_t) TYPE_FEATUREFUL(PullOp) -- 2.39.5