UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

crush: CHOOSE_LEAF -> CHOOSELEAF throughout 

This aligns the internal identifier names with the user-visible names in
the decompiled crush map language.

Reflects ceph.git commit caa0e22e15e4226c3671318ba1f61314bf6da2a6.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Ilya Dryomov 2013-12-24 21:19:26 +02:00
parent cc10df4a3a
commit 917edad5d1
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/crush/crush.h
View File

@ -44,11 +44,11 @@ enum {
/* arg2 = type */ /* arg2 = type */
CRUSH_RULE_CHOOSE_INDEP = 3, /* same */ CRUSH_RULE_CHOOSE_INDEP = 3, /* same */
CRUSH_RULE_EMIT = 4, /* no args */ CRUSH_RULE_EMIT = 4, /* no args */
CRUSH_RULE_CHOOSE_LEAF_FIRSTN = 6, CRUSH_RULE_CHOOSELEAF_FIRSTN = 6,
CRUSH_RULE_CHOOSE_LEAF_INDEP = 7, CRUSH_RULE_CHOOSELEAF_INDEP = 7,
CRUSH_RULE_SET_CHOOSE_TRIES = 8, /* override choose_total_tries */ CRUSH_RULE_SET_CHOOSE_TRIES = 8, /* override choose_total_tries */
CRUSH_RULE_SET_CHOOSE_LEAF_TRIES = 9, /* override chooseleaf_descend_once */ CRUSH_RULE_SET_CHOOSELEAF_TRIES = 9, /* override chooseleaf_descend_once */
}; };
/* /*

10
net/ceph/crush/mapper.c
View File

@ -666,25 +666,25 @@ int crush_do_rule(const struct crush_map *map,
choose_tries = curstep->arg1; choose_tries = curstep->arg1;
break; break;
case CRUSH_RULE_SET_CHOOSE_LEAF_TRIES: case CRUSH_RULE_SET_CHOOSELEAF_TRIES:
if (curstep->arg1 > 0) if (curstep->arg1 > 0)
choose_leaf_tries = curstep->arg1; choose_leaf_tries = curstep->arg1;
break; break;
case CRUSH_RULE_CHOOSE_LEAF_FIRSTN: case CRUSH_RULE_CHOOSELEAF_FIRSTN:
case CRUSH_RULE_CHOOSE_FIRSTN: case CRUSH_RULE_CHOOSE_FIRSTN:
firstn = 1; firstn = 1;
/* fall through */ /* fall through */
case CRUSH_RULE_CHOOSE_LEAF_INDEP: case CRUSH_RULE_CHOOSELEAF_INDEP:
case CRUSH_RULE_CHOOSE_INDEP: case CRUSH_RULE_CHOOSE_INDEP:
if (wsize == 0) if (wsize == 0)
break; break;
recurse_to_leaf = recurse_to_leaf =
curstep->op == curstep->op ==
CRUSH_RULE_CHOOSE_LEAF_FIRSTN || CRUSH_RULE_CHOOSELEAF_FIRSTN ||
curstep->op == curstep->op ==
CRUSH_RULE_CHOOSE_LEAF_INDEP; CRUSH_RULE_CHOOSELEAF_INDEP;
/* reset output */ /* reset output */
osize = 0; osize = 0;