]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
kclient: fix pps calculation to factor in pg pool
authorSage Weil <sage@newdream.net>
Wed, 17 Jun 2009 19:53:50 +0000 (12:53 -0700)
committerSage Weil <sage@newdream.net>
Wed, 17 Jun 2009 19:53:50 +0000 (12:53 -0700)
This was missed the first time around.

src/kernel/osd_client.c

index cbf2e99839faeab6e0037d4fa9f0ce6527e28b5d..8f8397d5872e2ade6f3f6e7d8a3a654ad7d79582 100644 (file)
@@ -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);