From: Sage Weil <sage@inktank.com>
Date: Thu, 7 Jun 2012 23:52:57 +0000 (-0700)
Subject: crush: fix leaf recursion if we already collided
X-Git-Tag: v0.48argonaut~97^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4abb53d4f313f49af41d2d77af0cc18c932ef317;p=ceph.git

crush: fix leaf recursion if we already collided

This just saves us some cycles, but does not effect placement results at
all.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/crush/mapper.c b/src/crush/mapper.c
index f691535af6e6..8ca87d794d08 100644
--- a/src/crush/mapper.c
+++ b/src/crush/mapper.c
@@ -392,7 +392,7 @@ static int crush_choose(const struct crush_map *map,
 				}
 
 				reject = 0;
-				if (recurse_to_leaf) {
+				if (!collide && recurse_to_leaf) {
 					if (item < 0) {
 						if (crush_choose(map,
 							 map->buckets[-1-item],