[Xenial SRU 5/6] Revert "crush: ensure take bucket value is valid"

[Thadeu Lima de Souza Cascardo]

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

This reverts commit 5a03f3043cb617cf2cf5ec9cbd0685d0e86e8b0e.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo at canonical.com>
---
 net/ceph/crush/mapper.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/ceph/crush/mapper.c b/net/ceph/crush/mapper.c
index abb700621e4a..97ecf6f262aa 100644
--- 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;
-- 
2.14.1