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>

1 files changed, 1 insertions, 1 deletions

diff --git a/net/ceph/crush/mapper.c b/net/ceph/crush/mapper.c
index 96c8a58937db..cbd06a91941c 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],