tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
crush: attempts -> tries
Reflects ceph.git commit ea3a0bb8b773360d73b8b77fa32115ef091c9857.
Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
+8
-8
+8
-8
net/ceph/crush/mapper.c
+8
-8
net/ceph/crush/mapper.c
···
298
298
const __u32 *weight, int weight_max,
299
299
int x, int numrep, int type,
300
300
int *out, int outpos,
301
-
unsigned int attempts,
302
-
unsigned int recurse_attempts,
301
+
unsigned int tries,
302
+
unsigned int recurse_tries,
303
303
unsigned int local_tries,
304
304
unsigned int local_fallback_tries,
305
305
int recurse_to_leaf,
···
388
388
weight, weight_max,
389
389
x, outpos+1, 0,
390
390
out2, outpos,
391
-
recurse_attempts, 0,
391
+
recurse_tries, 0,
392
392
local_tries,
393
393
local_fallback_tries,
394
394
0,
···
423
423
flocal <= in->size + local_fallback_tries)
424
424
/* exhaustive bucket search */
425
425
retry_bucket = 1;
426
-
else if (ftotal <= attempts)
426
+
else if (ftotal <= tries)
427
427
/* then retry descent */
428
428
retry_descent = 1;
429
429
else
···
461
461
const __u32 *weight, int weight_max,
462
462
int x, int left, int numrep, int type,
463
463
int *out, int outpos,
464
-
unsigned int attempts,
465
-
unsigned int recurse_attempts,
464
+
unsigned int tries,
465
+
unsigned int recurse_tries,
466
466
int recurse_to_leaf,
467
467
int *out2,
468
468
int parent_r)
···
487
487
out2[rep] = CRUSH_ITEM_UNDEF;
488
488
}
489
489
490
-
for (ftotal = 0; left > 0 && ftotal < attempts; ftotal++) {
490
+
for (ftotal = 0; left > 0 && ftotal < tries; ftotal++) {
491
491
for (rep = outpos; rep < endpos; rep++) {
492
492
if (out[rep] != CRUSH_ITEM_UNDEF)
493
493
continue;
···
572
572
weight, weight_max,
573
573
x, 1, numrep, 0,
574
574
out2, rep,
575
-
recurse_attempts, 0,
575
+
recurse_tries, 0,
576
576
0, NULL, r);
577
577
if (out2[rep] == CRUSH_ITEM_NONE) {
578
578
/* placed nothing; no leaf */