From: Samuel Just <sjust@redhat.com>
Date: Thu, 5 Jan 2017 20:23:32 +0000 (-0800)
Subject: osd/: hide pg_interval_t encoder
X-Git-Tag: v12.0.3~129^2~38
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0baebe166bb1f1120d57801c00b66bc82a84853c;p=ceph.git

osd/: hide pg_interval_t encoder

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

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index e3d45606d01b..df19f9927f9d 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -2857,6 +2857,7 @@ void PastIntervals::pg_interval_t::generate_test_instances(list<pg_interval_t*>&
   o.back()->maybe_went_rw = true;
 }
 
+WRITE_CLASS_ENCODER(PastIntervals::pg_interval_t)
 void PastIntervals::encode(bufferlist &bl) const
 {
   ::encode(past_intervals, bl);
diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 1dca167a89fc..c0ee2f6bd475 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -2683,7 +2683,6 @@ private:
   const_reverse_iterator rbegin() const { return past_intervals.rbegin(); }
   const_reverse_iterator rend() const { return past_intervals.rend(); }
 };
-WRITE_CLASS_ENCODER(PastIntervals::pg_interval_t)
 WRITE_CLASS_ENCODER(PastIntervals)
 
 ostream& operator<<(ostream& out, const PastIntervals::pg_interval_t& i);
diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
index 0ac9e64f8ed6..d4f4413080ae 100644
--- a/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@ -67,7 +67,6 @@ TYPE(pg_stat_t)
 TYPE_FEATUREFUL(pool_stat_t)
 TYPE(pg_history_t)
 TYPE(pg_info_t)
-TYPE(PastIntervals::pg_interval_t)
 TYPE_FEATUREFUL(pg_query_t)
 TYPE(pg_log_entry_t)
 TYPE(pg_log_t)