Commit 6d0a833b authored by Thadeu Lima de Souza Cascardo's avatar Thadeu Lima de Souza Cascardo Committed by Kleber Sacilotto de Souza

Revert "crush: ensure bucket id is valid before indexing buckets array"

BugLink: https://bugs.launchpad.net/bugs/1737033

This reverts commit 75ee940e.
Signed-off-by: default avatarThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Acked-by: default avatarStefan Bader <stefan.bader@canonical.com>
Acked-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent 7c9d0539
......@@ -888,7 +888,6 @@ int crush_do_rule(const struct crush_map *map,
osize = 0;
for (i = 0; i < wsize; i++) {
int bno;
/*
* see CRUSH_N, CRUSH_N_MINUS macros.
* basically, numrep <= 0 means relative to
......@@ -901,13 +900,6 @@ int crush_do_rule(const struct crush_map *map,
continue;
}
j = 0;
/* make sure bucket id is valid */
bno = -1 - w[i];
if (bno < 0 || bno >= map->max_buckets) {
/* w[i] is probably CRUSH_ITEM_NONE */
dprintk(" bad w[i] %d\n", w[i]);
continue;
}
if (firstn) {
int recurse_tries;
if (choose_leaf_tries)
......@@ -919,7 +911,7 @@ int crush_do_rule(const struct crush_map *map,
recurse_tries = choose_tries;
osize += crush_choose_firstn(
map,
map->buckets[bno],
map->buckets[-1-w[i]],
weight, weight_max,
x, numrep,
curstep->arg2,
......@@ -938,7 +930,7 @@ int crush_do_rule(const struct crush_map *map,
numrep : (result_max-osize));
crush_choose_indep(
map,
map->buckets[bno],
map->buckets[-1-w[i]],
weight, weight_max,
x, out_size, numrep,
curstep->arg2,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment