---

yaml --- r: 359562 b: refs/heads/master c: 7d7c1f6 h: refs/heads/master v: v3
git-mirror · Jan 17, 2013 · 6ebddf0 · 6ebddf0
1 parent a5e7cda
commit 6ebddf0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1604f488ac2dcce33c8218e75a000e8c5fb57e61
+refs/heads/master: 7d7c1f6136bac00174842f845babe7fb3483724e
diff --git a/trunk/net/ceph/crush/mapper.c b/trunk/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],