From cfd87ceefb46358adaa1751975c8d3a6b063bdf9 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 6 Jan 2011 10:38:39 -0800 Subject: [PATCH] objecter: use raw_pg_to_pg when needed Signed-off-by: Colin McCabe --- src/osdc/Objecter.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 05bc18c639725..8ce42bc4013e3 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 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; -- 2.39.5