1 files changed, 7 insertions, 32 deletions

diff --git a/net/ceph/crush/crush.c b/net/ceph/crush/crush.c
index d6ebb13a18a4..089613234f03 100644
--- a/net/ceph/crush/crush.c
+++ b/net/ceph/crush/crush.c
@@ -26,9 +26,9 @@ const char *crush_bucket_alg_name(int alg)
  * @b: bucket pointer
  * @p: item index in bucket
  */
-int crush_get_bucket_item_weight(struct crush_bucket *b, int p)
+int crush_get_bucket_item_weight(const struct crush_bucket *b, int p)
 {
-        if (p >= b->size)
+        if ((__u32)p >= b->size)
                 return 0;
 
         switch (b->alg) {
@@ -37,38 +37,13 @@ int crush_get_bucket_item_weight(struct crush_bucket *b, int p)
         case CRUSH_BUCKET_LIST:
                 return ((struct crush_bucket_list *)b)->item_weights[p];
         case CRUSH_BUCKET_TREE:
-                if (p & 1)
-                        return ((struct crush_bucket_tree *)b)->node_weights[p];
-                return 0;
+                return ((struct crush_bucket_tree *)b)->node_weights[crush_calc_tree_node(p)];
         case CRUSH_BUCKET_STRAW:
                 return ((struct crush_bucket_straw *)b)->item_weights[p];
         }
         return 0;
 }
 
-/**
- * crush_calc_parents - Calculate parent vectors for the given crush map.
- * @map: crush_map pointer
- */
-void crush_calc_parents(struct crush_map *map)
-{
-        int i, b, c;
-
-        for (b = 0; b < map->max_buckets; b++) {
-                if (map->buckets[b] == NULL)
-                        continue;
-                for (i = 0; i < map->buckets[b]->size; i++) {
-                        c = map->buckets[b]->items[i];
-                        BUG_ON(c >= map->max_devices ||
-                               c < -map->max_buckets);
-                        if (c >= 0)
-                                map->device_parents[c] = map->buckets[b]->id;
-                        else
-                                map->bucket_parents[-1-c] = map->buckets[b]->id;
-                }
-        }
-}
-
 void crush_destroy_bucket_uniform(struct crush_bucket_uniform *b)
 {
         kfree(b->h.perm);
@@ -87,6 +62,8 @@ void crush_destroy_bucket_list(struct crush_bucket_list *b)
 
 void crush_destroy_bucket_tree(struct crush_bucket_tree *b)
 {
+        kfree(b->h.perm);
+        kfree(b->h.items);
         kfree(b->node_weights);
         kfree(b);
 }
@@ -124,10 +101,9 @@ void crush_destroy_bucket(struct crush_bucket *b)
  */
 void crush_destroy(struct crush_map *map)
 {
-        int b;
-
         /* buckets */
         if (map->buckets) {
+                __s32 b;
                 for (b = 0; b < map->max_buckets; b++) {
                         if (map->buckets[b] == NULL)
                                 continue;
@@ -138,13 +114,12 @@ void crush_destroy(struct crush_map *map)
 
         /* rules */
         if (map->rules) {
+                __u32 b;
                 for (b = 0; b < map->max_rules; b++)
                         kfree(map->rules[b]);
                 kfree(map->rules);
         }
 
-        kfree(map->bucket_parents);
-        kfree(map->device_parents);
         kfree(map);
 }