From: Sage Weil <sage@inktank.com>
Date: Wed, 16 Jan 2013 02:49:09 +0000 (-0800)
Subject: crush: avoid recursion if we have already collided
X-Git-Tag: upstream/snapshot3+hdmi~5334^2~24^2~59^2~54
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d7c1f6136bac00174842f845babe7fb3483724e;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

crush: avoid recursion if we have already collided

This saves us some cycles, but does not affect the placement result at
all.

This corresponds to ceph.git commit 4abb53d4f.

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

diff --git a/net/ceph/crush/mapper.c b/net/ceph/crush/mapper.c
index 96c8a58..cbd06a9 100644
--- a/net/ceph/crush/mapper.c
+++ b/net/ceph/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],