commit 7d7c1f6136bac00174842f845babe7fb3483724e
author Sage Weil <sage@inktank.com> Tue Jan 15 18:49:09 2013 -0800
committer Alex Elder <elder@inktank.com> Thu Jan 17 12:42:39 2013 -0600
tree e4334780995901e60cfacbfc53b5026993fcb02e
parent 1604f488ac2dcce33c8218e75a000e8c5fb57e61

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>

net/ceph/crush/mapper.c

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 @@
 				}
 
 				reject = 0;
-				if (recurse_to_leaf) {
+				if (!collide && recurse_to_leaf) {
 					if (item < 0) {
 						if (crush_choose(map,
 							 map->buckets[-1-item],