RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-19 18:02:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

kclient: fix osdmap decoding of straw buckets

Browse Source 
Surprised this worked until now.
This commit is contained in:
Sage Weil 2009-03-09 14:50:37 -07:00
parent a098a3fdf9
commit f05b1bef64
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/kernel/osdmap.c
View File

@ -97,6 +97,9 @@ static int crush_decode_straw_bucket(void **p, void *end,
{ {
int j; int j;
dout(30, "crush_decode_straw_bucket %p to %p\n", *p, end); dout(30, "crush_decode_straw_bucket %p to %p\n", *p, end);
b->item_weights = kmalloc(b->h.size * sizeof(u32), GFP_NOFS);
if (b->item_weights == NULL)
return -ENOMEM;
b->straws = kmalloc(b->h.size * sizeof(u32), GFP_NOFS); b->straws = kmalloc(b->h.size * sizeof(u32), GFP_NOFS);
if (b->straws == NULL) if (b->straws == NULL)
return -ENOMEM; return -ENOMEM;
@ -153,19 +156,18 @@ static struct crush_map *crush_decode(void *pbyval, void *end)
/* buckets */ /* buckets */
for (i = 0; i < c->max_buckets; i++) { for (i = 0; i < c->max_buckets; i++) {
int size = 0; int size = 0;
u32 type; u32 alg;
struct crush_bucket *b; struct crush_bucket *b;
dout(30, "crush_decode bucket %d off %x %p to %p\n", ceph_decode_32_safe(p, end, alg, bad);
i, (int)(*p-start), *p, end); if (alg == 0) {
ceph_decode_32_safe(p, end, type, bad);
if (type == 0) {
c->buckets[i] = NULL; c->buckets[i] = NULL;
continue; continue;
} }
dout(30, "crush_decode bucket %d off %x %p to %p\n",
i, (int)(*p-start), *p, end);
switch (type) { switch (alg) {
case CRUSH_BUCKET_UNIFORM: case CRUSH_BUCKET_UNIFORM:
size = sizeof(struct crush_bucket_uniform); size = sizeof(struct crush_bucket_uniform);
break; break;
@ -204,7 +206,7 @@ static struct crush_map *crush_decode(void *pbyval, void *end)
for (j = 0; j < b->size; j++) for (j = 0; j < b->size; j++)
ceph_decode_32(p, b->items[j]); ceph_decode_32(p, b->items[j]);
switch (b->type) { switch (b->alg) {
case CRUSH_BUCKET_UNIFORM: case CRUSH_BUCKET_UNIFORM:
err = crush_decode_uniform_bucket(p, end, err = crush_decode_uniform_bucket(p, end,
(struct crush_bucket_uniform *)b); (struct crush_bucket_uniform *)b);