From: Sage Weil <sage@newdream.net>
Date: Thu, 6 Jan 2011 18:38:39 +0000 (-0800)
Subject: objecter: use raw_pg_to_pg when needed
X-Git-Tag: v0.25~370
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cfd87ceefb46358adaa1751975c8d3a6b063bdf9;p=ceph.git

objecter: use raw_pg_to_pg when needed

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 05bc18c63972..8ce42bc4013e 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -549,7 +549,7 @@ bool Objecter::recalc_op_target(Op *op)
   pg_t pgid = op->pgid;
   if (op->oid.name.length())
     pgid = osdmap->object_locator_to_pg(op->oid, op->oloc);
-  osdmap->pg_to_acting_osds(pgid, acting);
+  osdmap->pg_to_acting_osds(osdmap->raw_pg_to_pg(pgid), acting);
 
   if (op->pgid != pgid || is_pg_changed(op->acting, acting)) {
     op->pgid = pgid;
@@ -577,7 +577,7 @@ bool Objecter::recalc_linger_op_target(LingerOp *linger_op)
 {
   vector<int> acting;
   pg_t pgid = osdmap->object_locator_to_pg(linger_op->oid, linger_op->oloc);
-  osdmap->pg_to_acting_osds(pgid, acting);
+  osdmap->pg_to_acting_osds(osdmap->raw_pg_to_pg(pgid), acting);
 
   if (pgid != linger_op->pgid || is_pg_changed(linger_op->acting, acting)) {
     linger_op->pgid = pgid;