From: Samuel Just <sam.just@inktank.com>
Date: Wed, 17 Apr 2013 20:50:52 +0000 (-0700)
Subject: PG: use PGRef in C_PG_ActivateCommitted
X-Git-Tag: v0.61~136^2~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8bd89e12f86e64e285d7f2d88716267c41684311;p=ceph.git

PG: use PGRef in C_PG_ActivateCommitted

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 3a0aa23c37df..bd14f8eef7c0 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1381,7 +1381,7 @@ void PG::build_might_have_unfound()
 }
 
 struct C_PG_ActivateCommitted : public Context {
-  PG *pg;
+  PGRef pg;
   epoch_t epoch;
   C_PG_ActivateCommitted(PG *p, epoch_t e)
     : pg(p), epoch(e) {}
@@ -1452,7 +1452,6 @@ void PG::activate(ObjectStore::Transaction& t,
   clean_up_local(t); 
 
   // find out when we commit
-  get();   // for callback
   tfin.push_back(new C_PG_ActivateCommitted(this, query_epoch));
   
   // initialize snap_trimq
@@ -1803,7 +1802,6 @@ void PG::_activate_committed(epoch_t e)
   }
 
   unlock();
-  put();
 }
 
 /*