From f85e9caad806d431cd18c6b402ca1f06ed5d10b2 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 21 Nov 2008 09:43:31 -0800 Subject: [PATCH] crush: make recurse_to_leaf slightly less fragile --- src/crush/mapper.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/crush/mapper.c b/src/crush/mapper.c index da9c3b6f46f7b..6e300ae359105 100644 --- a/src/crush/mapper.c +++ b/src/crush/mapper.c @@ -435,11 +435,13 @@ int crush_do_rule(struct crush_map *map, case CRUSH_RULE_CHOOSE_INDEP: BUG_ON(wsize == 0); + recurse_to_leaf = + rule->steps[step].op == CRUSH_RULE_CHOOSE_LEAF_FIRSTN || + rule->steps[step].op == CRUSH_RULE_CHOOSE_LEAF_INDEP; + /* reset output */ osize = 0; - recurse_to_leaf = rule->steps[step].op >= - CRUSH_RULE_CHOOSE_LEAF_FIRSTN; for (i = 0; i < wsize; i++) { /* * see CRUSH_N, CRUSH_N_MINUS macros. -- 2.39.5