From: Sage Weil <sage@newdream.net>
Date: Wed, 17 Jun 2009 19:53:50 +0000 (-0700)
Subject: kclient: fix pps calculation to factor in pg pool
X-Git-Tag: v0.9~50
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2abc25aec80b7eb2d1666395965ed636fb574a8b;p=ceph.git

kclient: fix pps calculation to factor in pg pool

This was missed the first time around.
---

diff --git a/src/kernel/osd_client.c b/src/kernel/osd_client.c
index cbf2e99839fa..8f8397d5872e 100644
--- a/src/kernel/osd_client.c
+++ b/src/kernel/osd_client.c
@@ -368,6 +368,7 @@ static int map_osds(struct ceph_osd_client *osdc,
 		pps = ceph_stable_mod(pgid.pg.ps,
 				      le32_to_cpu(pool->v.pgp_num),
 				      pool->pgp_num_mask);
+	pps += pgid.pg.pool;
 	num = crush_do_rule(osdc->osdmap->crush, ruleno, pps, osds,
 			    min_t(int, pool->v.size, ARRAY_SIZE(osds)),
 			    pgid.pg.preferred, osdc->osdmap->osd_weight);