]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
PG: use PGRef in C_PG_ActivateCommitted
authorSamuel Just <sam.just@inktank.com>
Wed, 17 Apr 2013 20:50:52 +0000 (13:50 -0700)
committerSamuel Just <sam.just@inktank.com>
Fri, 19 Apr 2013 18:00:21 +0000 (11:00 -0700)
Signed-off-by: Samuel Just <sam.just@inktank.com>
src/osd/PG.cc

index 3a0aa23c37df5924c1a2640ba6e350fb244b022f..bd14f8eef7c03d03bb5a87e3248853cc8cd33e83 100644 (file)
@@ -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();
 }
 
 /*