diff options
| author | Sage Weil <sage@inktank.com> | 2012-05-07 15:38:35 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-26 11:38:03 -0800 |
| commit | 506b4672ace55889c16d4e9d5515e0c1ae7832d5 (patch) | |
| tree | 36da5c2597634f1398bb0f0d8cfdcec2fc617569 /include | |
| parent | 55649211861616c26aa25c9e710c5691837975e4 (diff) | |
| download | linux-3.10-506b4672ace55889c16d4e9d5515e0c1ae7832d5.tar.gz linux-3.10-506b4672ace55889c16d4e9d5515e0c1ae7832d5.tar.bz2 linux-3.10-506b4672ace55889c16d4e9d5515e0c1ae7832d5.zip | |
crush: clean up types, const-ness
(cherry picked from commit 8b12d47b80c7a34dffdd98244d99316db490ec58)
Move various types from int -> __u32 (or similar), and add const as
appropriate.
This reflects changes that have been present in the userland implementation
for some time.
Reviewed-by: Alex Elder <elder@inktank.com>
Signed-off-by: Sage Weil <sage@inktank.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/crush/crush.h | 2 | ||||
| -rw-r--r-- | include/linux/crush/mapper.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/crush/crush.h b/include/linux/crush/crush.h index 97e435b191f..3f50369a50e 100644 --- a/include/linux/crush/crush.h +++ b/include/linux/crush/crush.h @@ -168,7 +168,7 @@ struct crush_map { /* crush.c */ -extern int crush_get_bucket_item_weight(struct crush_bucket *b, int pos); +extern int crush_get_bucket_item_weight(const 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); diff --git a/include/linux/crush/mapper.h b/include/linux/crush/mapper.h index c46b99c18bb..9322ab8bccd 100644 --- a/include/linux/crush/mapper.h +++ b/include/linux/crush/mapper.h @@ -10,11 +10,11 @@ #include "crush.h" -extern int crush_find_rule(struct crush_map *map, int pool, int type, int size); -extern int crush_do_rule(struct crush_map *map, +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, int ruleno, int x, int *result, int result_max, int forcefeed, /* -1 for none */ - __u32 *weights); + const __u32 *weights); #endif |