From 94fc886fa87dd43f7518c517d7ff0ee45951327d Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 24 Jun 2010 12:55:48 -0700
Subject: [PATCH] --- yaml --- r: 200843 b: refs/heads/master c:
 55bda7aacd13f5fdfeaafc16934953171405c692 h: refs/heads/master i:   200841:
 fa49053668d5329cb346ad9f69f830cc973c9635   200839:
 00bb4d19dff57d911a54bf146cbf1dd11f56d51a v: v3

---
 [refs]                       | 2 +-
 trunk/fs/ceph/crush/mapper.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 01de50abfe30..7fafc0d92704 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfaf148eb2e42c00f1c79b2163f0804068ea0c5e
+refs/heads/master: 55bda7aacd13f5fdfeaafc16934953171405c692
diff --git a/trunk/fs/ceph/crush/mapper.c b/trunk/fs/ceph/crush/mapper.c
index 9ba54efb6543..804e6d53b77c 100644
--- a/trunk/fs/ceph/crush/mapper.c
+++ b/trunk/fs/ceph/crush/mapper.c
@@ -366,6 +366,7 @@ static int crush_choose(struct crush_map *map,
 					BUG_ON(item >= 0 ||
 					       (-1-item) >= map->max_buckets);
 					in = map->buckets[-1-item];
+					retry_bucket = 1;
 					continue;
 				}