summaryrefslogtreecommitdiffstats
path: root/fs/ceph/crush
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2009-11-01 17:53:24 -0800
committerSage Weil <sage@newdream.net>2009-11-01 17:53:24 -0800
commit33aa96e7430d215e2ee779f65cdad0f6d4571fe1 (patch)
tree00309ddde7506b0c2a86a20f5b579a60623005ab /fs/ceph/crush
parent63ff78b25c4b204075b5b98afcac6ad3639d43fe (diff)
crush: always return a value from crush_bucket_choose
Even when we encounter a corrupt bucket. We still BUG(). This fixes the warning fs/ceph/crush/mapper.c: In function 'crush_choose': fs/ceph/crush/mapper.c:352: warning: control may reach end of non-void function 'crush_bucket_choose' being inlined Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/crush')
-rw-r--r--fs/ceph/crush/mapper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/crush/mapper.c b/fs/ceph/crush/mapper.c
index c268393adfc..54f3f402af6 100644
--- a/fs/ceph/crush/mapper.c
+++ b/fs/ceph/crush/mapper.c
@@ -253,7 +253,7 @@ static int crush_bucket_choose(struct crush_bucket *in, int x, int r)
x, r);
default:
BUG_ON(1);
-/* return in->items[0] */;
+ return in->items[0];
}
}