evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

crush: attempts -> tries

Browse source 
Reflects ceph.git commit ea3a0bb8b773360d73b8b77fa32115ef091c9857.

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:27 +02:00
parent f046bf9208
commit 2d8be0bc8b
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
net/ceph/crush/mapper.c
View file

@ -298,8 +298,8 @@ static int crush_choose_firstn(const struct crush_map *map,
const __u32 *weight, int weight_max, const __u32 *weight, int weight_max,
int x, int numrep, int type, int x, int numrep, int type,
int *out, int outpos, int *out, int outpos,
unsigned int attempts, unsigned int tries,
unsigned int recurse_attempts, unsigned int recurse_tries,
unsigned int local_tries, unsigned int local_tries,
unsigned int local_fallback_tries, unsigned int local_fallback_tries,
int recurse_to_leaf, int recurse_to_leaf,
@ -388,7 +388,7 @@ static int crush_choose_firstn(const struct crush_map *map,
weight, weight_max, weight, weight_max,
x, outpos+1, 0, x, outpos+1, 0,
out2, outpos, out2, outpos,
recurse_attempts, 0, recurse_tries, 0,
local_tries, local_tries,
local_fallback_tries, local_fallback_tries,
0, 0,
@ -423,7 +423,7 @@ reject:
flocal <= in->size + local_fallback_tries) flocal <= in->size + local_fallback_tries)
/* exhaustive bucket search */ /* exhaustive bucket search */
retry_bucket = 1; retry_bucket = 1;
else if (ftotal <= attempts) else if (ftotal <= tries)
/* then retry descent */ /* then retry descent */
retry_descent = 1; retry_descent = 1;
else else
@ -461,8 +461,8 @@ static void crush_choose_indep(const struct crush_map *map,
const __u32 *weight, int weight_max, const __u32 *weight, int weight_max,
int x, int left, int numrep, int type, int x, int left, int numrep, int type,
int *out, int outpos, int *out, int outpos,
unsigned int attempts, unsigned int tries,
unsigned int recurse_attempts, unsigned int recurse_tries,
int recurse_to_leaf, int recurse_to_leaf,
int *out2, int *out2,
int parent_r) int parent_r)
@ -487,7 +487,7 @@ static void crush_choose_indep(const struct crush_map *map,
out2[rep] = CRUSH_ITEM_UNDEF; out2[rep] = CRUSH_ITEM_UNDEF;
} }
for (ftotal = 0; left > 0 && ftotal < attempts; ftotal++) { for (ftotal = 0; left > 0 && ftotal < tries; ftotal++) {
for (rep = outpos; rep < endpos; rep++) { for (rep = outpos; rep < endpos; rep++) {
if (out[rep] != CRUSH_ITEM_UNDEF) if (out[rep] != CRUSH_ITEM_UNDEF)
continue; continue;
@ -572,7 +572,7 @@ static void crush_choose_indep(const struct crush_map *map,
weight, weight_max, weight, weight_max,
x, 1, numrep, 0, x, 1, numrep, 0,
out2, rep, out2, rep,
recurse_attempts, 0, recurse_tries, 0,
0, NULL, r); 0, NULL, r);
if (out2[rep] == CRUSH_ITEM_NONE) { if (out2[rep] == CRUSH_ITEM_NONE) {
/* placed nothing; no leaf */ /* placed nothing; no leaf */