projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
63ff78b
)
crush: always return a value from crush_bucket_choose
author
Sage Weil
<sage@newdream.net>
Mon, 2 Nov 2009 01:53:24 +0000
(17:53 -0800)
committer
Sage Weil
<sage@newdream.net>
Mon, 2 Nov 2009 01:53:24 +0000
(17:53 -0800)
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>
fs/ceph/crush/mapper.c
patch
|
blob
|
history
diff --git
a/fs/ceph/crush/mapper.c
b/fs/ceph/crush/mapper.c
index c268393adfcb9307b06e98ee32305ac8fa404347..54f3f402af60b4865e6c8b0d25b16efb6efc55bd 100644
(file)
--- 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]
;
}
}