diff options
| author | Ilya Dryomov <ilya.dryomov@inktank.com> | 2013-12-24 21:19:24 +0200 |
|---|---|---|
| committer | Ilya Dryomov <ilya.dryomov@inktank.com> | 2013-12-31 20:32:14 +0200 |
| commit | e8ef19c4ad161768e1d8309d5ae18481c098eb81 (patch) | |
| tree | 9ba7cd6965c530228085fba2bf23dcc132ea94d3 /include/linux/crush | |
| parent | 2a4ba74ef67ad3a1645d78487ed7ccd0f40063c0 (diff) | |
| download | linux-stable-e8ef19c4ad161768e1d8309d5ae18481c098eb81.tar.gz linux-stable-e8ef19c4ad161768e1d8309d5ae18481c098eb81.tar.bz2 linux-stable-e8ef19c4ad161768e1d8309d5ae18481c098eb81.zip | |
crush: eliminate CRUSH_MAX_SET result size limitation
This is only present to size the temporary scratch arrays that we put on
the stack. Let the caller allocate them as they wish and remove the
limitation.
Reflects ceph.git commit 1cfe140bf2dab99517589a82a916f4c75b9492d1.
Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'include/linux/crush')
| -rw-r--r-- | include/linux/crush/crush.h | 1 | ||||
| -rw-r--r-- | include/linux/crush/mapper.h | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/crush/crush.h b/include/linux/crush/crush.h index 09561a04c127..83543c504b5a 100644 --- a/include/linux/crush/crush.h +++ b/include/linux/crush/crush.h @@ -21,7 +21,6 @@ #define CRUSH_MAX_DEPTH 10 /* max crush hierarchy depth */ -#define CRUSH_MAX_SET 10 /* max size of a mapping result */ /* diff --git a/include/linux/crush/mapper.h b/include/linux/crush/mapper.h index 69310b031875..eab367446eea 100644 --- a/include/linux/crush/mapper.h +++ b/include/linux/crush/mapper.h @@ -14,6 +14,7 @@ extern int crush_find_rule(const struct crush_map *map, int ruleset, int type, i extern int crush_do_rule(const struct crush_map *map, int ruleno, int x, int *result, int result_max, - const __u32 *weights, int weight_max); + const __u32 *weights, int weight_max, + int *scratch); #endif |