From: Samuel Just <sam.just@inktank.com>
Date: Wed, 17 Apr 2013 21:13:11 +0000 (-0700)
Subject: ReplicatedPG: use the ReplicatedPGRef typedef
X-Git-Tag: v0.61~136^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ec6f71bd027036a3d3496625cf8dfcd9121bc828;p=ceph.git

ReplicatedPG: use the ReplicatedPGRef typedef

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

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index a21c0ce18cb6..0bc8a6beff68 100644
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -787,7 +787,7 @@ protected:
     }
   };
   struct C_OSD_AppliedRecoveredObject : public Context {
-    boost::intrusive_ptr<ReplicatedPG> pg;
+    ReplicatedPGRef pg;
     ObjectStore::Transaction *t;
     ObjectContext *obc;
     C_OSD_AppliedRecoveredObject(ReplicatedPG *p, ObjectStore::Transaction *tt, ObjectContext *o) :
@@ -797,7 +797,7 @@ protected:
     }
   };
   struct C_OSD_CommittedPushedObject : public Context {
-    boost::intrusive_ptr<ReplicatedPG> pg;
+    ReplicatedPGRef pg;
     OpRequestRef op;
     epoch_t epoch;
     eversion_t last_complete;
@@ -822,7 +822,7 @@ protected:
     }
   };
   struct C_OSD_CompletedPull : public Context {
-    boost::intrusive_ptr<ReplicatedPG> pg;
+    ReplicatedPGRef pg;
     hobject_t hoid;
     epoch_t epoch;
     C_OSD_CompletedPull(
@@ -839,7 +839,7 @@ protected:
   };
   friend class C_OSD_CompletedPull;
   struct C_OSD_AppliedRecoveredObjectReplica : public Context {
-    boost::intrusive_ptr<ReplicatedPG> pg;
+    ReplicatedPGRef pg;
     ObjectStore::Transaction *t;
     C_OSD_AppliedRecoveredObjectReplica(ReplicatedPG *p, ObjectStore::Transaction *tt) :
       pg(p), t(tt) {}