Patched in Tegra support.

2 files changed, 17 insertions, 18 deletions

diff --git a/include/linux/crush/crush.h b/include/linux/crush/crush.h
index 25baa287cff..97e435b191f 100644
--- a/include/linux/crush/crush.h
+++ b/include/linux/crush/crush.h
@@ -151,22 +151,25 @@ struct crush_map {
         struct crush_bucket **buckets;
         struct crush_rule **rules;
 
+        /*
+         * Parent pointers to identify the parent bucket a device or
+         * bucket in the hierarchy.  If an item appears more than
+         * once, this is the _last_ time it appeared (where buckets
+         * are processed in bucket id order, from -1 on down to
+         * -max_buckets.
+         */
+        __u32 *bucket_parents;
+        __u32 *device_parents;
+
         __s32 max_buckets;
         __u32 max_rules;
         __s32 max_devices;
-
-        /* choose local retries before re-descent */
-        __u32 choose_local_tries;
-        /* choose local attempts using a fallback permutation before
-         * re-descent */
-        __u32 choose_local_fallback_tries;
-        /* choose attempts before giving up */ 
-        __u32 choose_total_tries;
 };
 
 
 /* crush.c */
-extern int crush_get_bucket_item_weight(const struct crush_bucket *b, int pos);
+extern int crush_get_bucket_item_weight(struct crush_bucket *b, int pos);
+extern void crush_calc_parents(struct crush_map *map);
 extern void crush_destroy_bucket_uniform(struct crush_bucket_uniform *b);
 extern void crush_destroy_bucket_list(struct crush_bucket_list *b);
 extern void crush_destroy_bucket_tree(struct crush_bucket_tree *b);
@@ -174,9 +177,4 @@ extern void crush_destroy_bucket_straw(struct crush_bucket_straw *b);
 extern void crush_destroy_bucket(struct crush_bucket *b);
 extern void crush_destroy(struct crush_map *map);
 
-static inline int crush_calc_tree_node(int i)
-{
-        return ((i+1) << 1)-1;
-}
-
 #endif
diff --git a/include/linux/crush/mapper.h b/include/linux/crush/mapper.h
index 5772dee3ecb..c46b99c18bb 100644
--- a/include/linux/crush/mapper.h
+++ b/include/linux/crush/mapper.h
@@ -8,12 +8,13 @@
  * LGPL2
  */
 
-#include <linux/crush/crush.h>
+#include "crush.h"
 
-extern int crush_find_rule(const struct crush_map *map, int ruleset, int type, int size);
-extern int crush_do_rule(const struct crush_map *map,
+extern int crush_find_rule(struct crush_map *map, int pool, int type, int size);
+extern int crush_do_rule(struct crush_map *map,
                          int ruleno,
                          int x, int *result, int result_max,
-                         const __u32 *weights);
+                         int forcefeed,    /* -1 for none */
+                         __u32 *weights);
 
 #endif