From: Sage Weil <sage@inktank.com>
Date: Fri, 24 Jan 2014 22:18:49 +0000 (-0800)
Subject: osd/HitSet: add HitSetRef
X-Git-Tag: v0.78~166^2~32
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=34fcf42c697d5fdfdf5fea9de81b3c6cb2556de9;p=ceph.git

osd/HitSet: add HitSetRef

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osd/HitSet.h b/src/osd/HitSet.h
index b6acce948505..391dd63ee8fa 100644
--- a/src/osd/HitSet.h
+++ b/src/osd/HitSet.h
@@ -170,6 +170,8 @@ private:
 WRITE_CLASS_ENCODER(HitSet);
 WRITE_CLASS_ENCODER(HitSet::Params);
 
+typedef boost::shared_ptr<HitSet> HitSetRef;
+
 ostream& operator<<(ostream& out, const HitSet::Params& p);
 
 /**
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index c40ea9a57eb2..8dcc54b1ca55 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -9907,7 +9907,7 @@ hobject_t ReplicatedPG::get_hit_set_archive_object(utime_t start, utime_t end)
 void ReplicatedPG::hit_set_clear()
 {
   dout(20) << __func__ << dendl;
-  hit_set.reset(NULL);
+  hit_set.reset();
   hit_set_start_stamp = utime_t();
 }
 
diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index f29362299422..4f683a65a328 100644
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -664,7 +664,7 @@ protected:
   void simple_repop_submit(RepGather *repop);
 
   // hot/cold tracking
-  boost::scoped_ptr<HitSet> hit_set;  ///< currently accumulating HitSet
+  HitSetRef hit_set;        ///< currently accumulating HitSet
   utime_t hit_set_start_stamp;    ///< time the current HitSet started recording
 
   void hit_set_clear();     ///< discard any HitSet state