From 37aaca1d822324e517dcf39a458a4e4eef5a9f60 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 7 May 2012 15:35:09 -0700 Subject: [PATCH] --- yaml --- r: 309437 b: refs/heads/master c: c90f95ed46393e29d843686e21947d1c6fcb1164 h: refs/heads/master i: 309435: 3a953b795a61d73a8292b7d2dfd60e6393d70d0c v: v3 --- [refs] | 2 +- trunk/net/ceph/crush/mapper.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d50ded41eea1..4ba1a41f1c2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b12d47b80c7a34dffdd98244d99316db490ec58 +refs/heads/master: c90f95ed46393e29d843686e21947d1c6fcb1164 diff --git a/trunk/net/ceph/crush/mapper.c b/trunk/net/ceph/crush/mapper.c index 436102a8a461..583f644b0e28 100644 --- a/trunk/net/ceph/crush/mapper.c +++ b/trunk/net/ceph/crush/mapper.c @@ -415,7 +415,7 @@ static int crush_choose(const struct crush_map *map, 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)