Revert "crush: ensure take bucket value is valid"

BugLink: https://bugs.launchpad.net/bugs/1737033
This reverts commit 5a03f3043cb617cf2cf5ec9cbd0685d0e86e8b0e.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/net/ceph/crush/mapper.c b/net/ceph/crush/mapper.c
index abb700621e4ab040b1a0450f24e9a9267d2a6625..97ecf6f262aac98b27fa44e7a23f166d13cf2d31 100644 (file)
--- a/net/ceph/crush/mapper.c
+++ b/net/ceph/crush/mapper.c
@@ -835,8 +835,7 @@ int crush_do_rule(const struct crush_map *map,
                case CRUSH_RULE_TAKE:
                        if ((curstep->arg1 >= 0 &&
                             curstep->arg1 < map->max_devices) ||
-                           (-1-curstep->arg1 >= 0 &&
-                            -1-curstep->arg1 < map->max_buckets &&
+                           (-1-curstep->arg1 < map->max_buckets &&
                             map->buckets[-1-curstep->arg1])) {
                                w[0] = curstep->arg1;
                                wsize = 1;