diff options
author | Sage Weil <sage@inktank.com> | 2012-05-07 18:36:35 -0400 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2012-05-07 18:39:34 -0400 |
commit | fc7c3ae5ab9246ad96aab4d0d57f67e9255cfb56 (patch) | |
tree | 07ceb79e0a20f9faac7c1621a0543e7ba908b6ff /net/ceph/crush | |
parent | 41ebcc0907c58f75d0b25afcaf8b9c35c6b1ad14 (diff) |
crush: remove parent maps
These were used for the ill-fated forcefeed feature. Remove them.
Reflects ceph.git commit ebdf80edfecfbd5a842b71fbe5732857994380c1.
Reviewed-by: Alex Elder <elder@inktank.com>
Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'net/ceph/crush')
-rw-r--r-- | net/ceph/crush/crush.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/net/ceph/crush/crush.c b/net/ceph/crush/crush.c index 8dd19a0deedc..2160791acf03 100644 --- a/net/ceph/crush/crush.c +++ b/net/ceph/crush/crush.c | |||
@@ -46,29 +46,6 @@ int crush_get_bucket_item_weight(const struct crush_bucket *b, int p) | |||
46 | return 0; | 46 | return 0; |
47 | } | 47 | } |
48 | 48 | ||
49 | /** | ||
50 | * crush_calc_parents - Calculate parent vectors for the given crush map. | ||
51 | * @map: crush_map pointer | ||
52 | */ | ||
53 | void crush_calc_parents(struct crush_map *map) | ||
54 | { | ||
55 | int i, b, c; | ||
56 | |||
57 | for (b = 0; b < map->max_buckets; b++) { | ||
58 | if (map->buckets[b] == NULL) | ||
59 | continue; | ||
60 | for (i = 0; i < map->buckets[b]->size; i++) { | ||
61 | c = map->buckets[b]->items[i]; | ||
62 | BUG_ON(c >= map->max_devices || | ||
63 | c < -map->max_buckets); | ||
64 | if (c >= 0) | ||
65 | map->device_parents[c] = map->buckets[b]->id; | ||
66 | else | ||
67 | map->bucket_parents[-1-c] = map->buckets[b]->id; | ||
68 | } | ||
69 | } | ||
70 | } | ||
71 | |||
72 | void crush_destroy_bucket_uniform(struct crush_bucket_uniform *b) | 49 | void crush_destroy_bucket_uniform(struct crush_bucket_uniform *b) |
73 | { | 50 | { |
74 | kfree(b->h.perm); | 51 | kfree(b->h.perm); |
@@ -143,8 +120,6 @@ void crush_destroy(struct crush_map *map) | |||
143 | kfree(map->rules); | 120 | kfree(map->rules); |
144 | } | 121 | } |
145 | 122 | ||
146 | kfree(map->bucket_parents); | ||
147 | kfree(map->device_parents); | ||
148 | kfree(map); | 123 | kfree(map); |
149 | } | 124 | } |
150 | 125 | ||