From 6b5be27634ad307b471a5bf0db85c4f5c834885f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 19 Feb 2012 11:59:11 -0800 Subject: [PATCH] crush: cleanup: use temp var for curstep Signed-off-by: Sage Weil --- src/crush/mapper.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/crush/mapper.c b/src/crush/mapper.c index eef875a35e86b..df195c7bff09b 100644 --- a/src/crush/mapper.c +++ b/src/crush/mapper.c @@ -519,10 +519,12 @@ int crush_do_rule(const struct crush_map *map, } for (step = 0; step < rule->len; step++) { + struct crush_rule_step *curstep = &rule->steps[step]; + firstn = 0; - switch (rule->steps[step].op) { + switch (curstep->op) { case CRUSH_RULE_TAKE: - w[0] = rule->steps[step].arg1; + w[0] = curstep->arg1; /* find position in force_context/hierarchy */ while (force_pos >= 0 && force_context[force_pos] != w[0]) @@ -544,9 +546,9 @@ int crush_do_rule(const struct crush_map *map, break; recurse_to_leaf = - rule->steps[step].op == + curstep->op == CRUSH_RULE_CHOOSE_LEAF_FIRSTN || - rule->steps[step].op == + curstep->op == CRUSH_RULE_CHOOSE_LEAF_INDEP; /* reset output */ @@ -558,7 +560,7 @@ int crush_do_rule(const struct crush_map *map, * basically, numrep <= 0 means relative to * the provided result_max */ - numrep = rule->steps[step].arg1; + numrep = curstep->arg1; if (numrep <= 0) { numrep += result_max; if (numrep <= 0) @@ -569,7 +571,7 @@ int crush_do_rule(const struct crush_map *map, /* skip any intermediate types */ while (force_pos && force_context[force_pos] < 0 && - rule->steps[step].arg2 != + curstep->arg2 != map->buckets[-1 - force_context[force_pos]]->type) force_pos--; @@ -583,7 +585,7 @@ int crush_do_rule(const struct crush_map *map, map->buckets[-1-w[i]], weight, x, numrep, - rule->steps[step].arg2, + curstep->arg2, o+osize, j, firstn, recurse_to_leaf, c+osize); @@ -611,7 +613,7 @@ int crush_do_rule(const struct crush_map *map, default: dprintk(" unknown op %d at step %d\n", - rule->steps[step].op, step); + curstep->op, step); break; } } -- 2.39.5