summaryrefslogtreecommitdiffstats
path: root/net/ceph/osdmap.c
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-05-08 00:39:29 +0200
committerSage Weil <sage@inktank.com>2012-05-08 00:39:29 +0200
commit41ebcc0907c58f75d0b25afcaf8b9c35c6b1ad14 (patch)
treec05054ce3d7fc0e512501a708511a9b1bd8647eb /net/ceph/osdmap.c
parentcrush: use a temporary variable to simplify crush_do_rule (diff)
downloadlinux-41ebcc0907c58f75d0b25afcaf8b9c35c6b1ad14.tar.xz
linux-41ebcc0907c58f75d0b25afcaf8b9c35c6b1ad14.zip
crush: remove forcefeed functionality
Remove forcefeed functionality from CRUSH. This is an ugly misfeature that is mostly useless and unused. Remove it. Reflects ceph.git commit ed974b5000f2851207d860a651809af4a1867942. Reviewed-by: Alex Elder <elder@inktank.com> Signed-off-by: Sage Weil <sage@inktank.com> Conflicts: net/ceph/crush/mapper.c
Diffstat (limited to 'net/ceph/osdmap.c')
-rw-r--r--net/ceph/osdmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
index 7d39f3cb4947..9dda36f7aa9d 100644
--- a/net/ceph/osdmap.c
+++ b/net/ceph/osdmap.c
@@ -1069,7 +1069,7 @@ static int *calc_pg_raw(struct ceph_osdmap *osdmap, struct ceph_pg pgid,
pps += poolid;
*num = crush_do_rule(osdmap->crush, ruleno, pps, osds,
min_t(int, pool->v.size, *num),
- -1, osdmap->osd_weight);
+ osdmap->osd_weight);
return osds;
}