From: Sage Weil <sage@redhat.com>
Date: Mon, 18 Sep 2017 19:04:44 +0000 (-0500)
Subject: osd: use pg_id.pool() for pg pool id
X-Git-Tag: v13.0.1~634^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=070181a9e5dc796734ecd25d97ccef7dd1374169;p=ceph.git

osd: use pg_id.pool() for pg pool id

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 7d941eeff3f..f6e6734bbbf 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -7620,9 +7620,9 @@ bool OSD::advance_pg(
     set<spg_t> children;
     spg_t parent(pg->pg_id);
     if (parent.is_split(
-	lastmap->get_pg_num(pg->pool.id),
-	nextmap->get_pg_num(pg->pool.id),
-	&children)) {
+	  lastmap->get_pg_num(pg->pg_id.pool()),
+	  nextmap->get_pg_num(pg->pg_id.pool()),
+	  &children)) {
       service.mark_split_in_progress(pg->pg_id, children);
       split_pgs(
 	pg, children, new_pgs, lastmap, nextmap,
@@ -7887,7 +7887,7 @@ void OSD::split_pgs(
   PG::RecoveryCtx *rctx)
 {
   unsigned pg_num = nextmap->get_pg_num(
-    parent->pool.id);
+    parent->pg_id.pool());
   parent->update_snap_mapper_bits(
     parent->get_pgid().get_split_bits(pg_num)
     );