From 2d8be0bc8bc2dc7d3fc3d322c4db3fdf6c924660 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Tue, 24 Dec 2013 21:19:27 +0200 Subject: crush: attempts -> tries Reflects ceph.git commit ea3a0bb8b773360d73b8b77fa32115ef091c9857. Signed-off-by: Ilya Dryomov Reviewed-by: Sage Weil --- net/ceph/crush/mapper.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'net') diff --git a/net/ceph/crush/mapper.c b/net/ceph/crush/mapper.c index 8cde4818e18..71ce4f12a7c 100644 --- a/net/ceph/crush/mapper.c +++ b/net/ceph/crush/mapper.c @@ -298,8 +298,8 @@ static int crush_choose_firstn(const struct crush_map *map, const __u32 *weight, int weight_max, int x, int numrep, int type, int *out, int outpos, - unsigned int attempts, - unsigned int recurse_attempts, + unsigned int tries, + unsigned int recurse_tries, unsigned int local_tries, unsigned int local_fallback_tries, int recurse_to_leaf, @@ -388,7 +388,7 @@ static int crush_choose_firstn(const struct crush_map *map, weight, weight_max, x, outpos+1, 0, out2, outpos, - recurse_attempts, 0, + recurse_tries, 0, local_tries, local_fallback_tries, 0, @@ -423,7 +423,7 @@ reject: flocal <= in->size + local_fallback_tries) /* exhaustive bucket search */ retry_bucket = 1; - else if (ftotal <= attempts) + else if (ftotal <= tries) /* then retry descent */ retry_descent = 1; else @@ -461,8 +461,8 @@ static void crush_choose_indep(const struct crush_map *map, const __u32 *weight, int weight_max, int x, int left, int numrep, int type, int *out, int outpos, - unsigned int attempts, - unsigned int recurse_attempts, + unsigned int tries, + unsigned int recurse_tries, int recurse_to_leaf, int *out2, int parent_r) @@ -487,7 +487,7 @@ static void crush_choose_indep(const struct crush_map *map, 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++) { if (out[rep] != CRUSH_ITEM_UNDEF) continue; @@ -572,7 +572,7 @@ static void crush_choose_indep(const struct crush_map *map, weight, weight_max, x, 1, numrep, 0, out2, rep, - recurse_attempts, 0, + recurse_tries, 0, 0, NULL, r); if (out2[rep] == CRUSH_ITEM_NONE) { /* placed nothing; no leaf */ -- cgit v1.2.3-70-g09d2