From: Sage Weil Date: Mon, 7 May 2012 22:35:09 +0000 (-0700) Subject: crush: adjust local retry threshold X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c90f95ed46393e29d843686e21947d1c6fcb1164;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git crush: adjust local retry threshold This small adjustment reflects a change that was made in ceph.git commit af6a9f30696c900a2a8bd7ae24e8ed15fb4964bb, about 6 months ago. An N-1 search is not exhaustive. Fixed ceph.git bug #1594. Reviewed-by: Alex Elder Signed-off-by: Sage Weil --- diff --git a/net/ceph/crush/mapper.c b/net/ceph/crush/mapper.c index 436102a8a461..583f644b0e28 100644 --- a/net/ceph/crush/mapper.c +++ b/net/ceph/crush/mapper.c @@ -415,7 +415,7 @@ reject: if (collide && flocal < 3) /* retry locally a few times */ retry_bucket = 1; - else if (flocal < in->size + orig_tries) + else if (flocal <= in->size + orig_tries) /* exhaustive bucket search */ retry_bucket = 1; else if (ftotal < 20)