From 6ebddf089f17afd8950fac784283d124a44a8f68 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Tue, 15 Jan 2013 18:49:09 -0800
Subject: [PATCH] --- yaml --- r: 359562 b: refs/heads/master c:
 7d7c1f6136bac00174842f845babe7fb3483724e h: refs/heads/master 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 ee8212def034..850e09b05053 100644
--- 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
index 96c8a58937db..cbd06a91941c 100644
--- 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],