From: Samuel Just <sjust@redhat.com>
Date: Mon, 21 Sep 2015 22:42:52 +0000 (-0700)
Subject: osd/: remove unused pg_hit_set_history_t::current_last_stamp
X-Git-Tag: v9.1.0~45^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=66a9bfdb32a5a3d82c2edf60db713f4fec9c24ae;p=ceph.git

osd/: remove unused pg_hit_set_history_t::current_last_stamp

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 5ce65562d5d3..439c355eb144 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -10972,7 +10972,6 @@ void ReplicatedPG::hit_set_persist()
   updated_hit_set_hist.history.push_back(updated_hit_set_hist.current_info);
   hit_set_create();
   updated_hit_set_hist.current_info = pg_hit_set_info_t(pool.info.use_gmt_hitset);
-  updated_hit_set_hist.current_last_stamp = utime_t();
 
   // fabricate an object_info_t and SnapSet
   obc->obs.oi.version = ctx->at_version;
diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index a675d5640759..e33acc08e82a 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -4000,7 +4000,10 @@ void pg_hit_set_history_t::encode(bufferlist& bl) const
 {
   ENCODE_START(1, 1, bl);
   ::encode(current_last_update, bl);
-  ::encode(current_last_stamp, bl);
+  {
+    utime_t dummy_stamp;
+    ::encode(dummy_stamp, bl);
+  }
   ::encode(current_info, bl);
   ::encode(history, bl);
   ENCODE_FINISH(bl);
@@ -4010,7 +4013,10 @@ void pg_hit_set_history_t::decode(bufferlist::iterator& p)
 {
   DECODE_START(1, p);
   ::decode(current_last_update, p);
-  ::decode(current_last_stamp, p);
+  {
+    utime_t dummy_stamp;
+    ::decode(dummy_stamp, p);
+  }
   ::decode(current_info, p);
   ::decode(history, p);
   DECODE_FINISH(p);
@@ -4019,7 +4025,6 @@ void pg_hit_set_history_t::decode(bufferlist::iterator& p)
 void pg_hit_set_history_t::dump(Formatter *f) const
 {
   f->dump_stream("current_last_update") << current_last_update;
-  f->dump_stream("current_last_stamp") << current_last_stamp;
   f->open_object_section("current_info");
   current_info.dump(f);
   f->close_section();
@@ -4038,7 +4043,6 @@ void pg_hit_set_history_t::generate_test_instances(list<pg_hit_set_history_t*>&
   ls.push_back(new pg_hit_set_history_t);
   ls.push_back(new pg_hit_set_history_t);
   ls.back()->current_last_update = eversion_t(1, 2);
-  ls.back()->current_last_stamp = utime_t(100, 123);
   ls.back()->current_info.begin = utime_t(2, 4);
   ls.back()->current_info.end = utime_t(62, 24);
   ls.back()->history.push_back(ls.back()->current_info);
diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index baace7c396ce..832d8d07996d 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -1740,7 +1740,6 @@ WRITE_CLASS_ENCODER(pg_hit_set_info_t)
  */
 struct pg_hit_set_history_t {
   eversion_t current_last_update;  ///< last version inserted into current set
-  utime_t current_last_stamp;      ///< timestamp of last insert
   pg_hit_set_info_t current_info;  ///< metadata about the current set
   list<pg_hit_set_info_t> history; ///< archived sets, sorted oldest -> newest