iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crush: assume weight_set != null imples weight_set_size > 0

Browse Source 
Reflects ceph.git commit 5e8fa3e06b68fae1582c9230a3a8d1abc6146286.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Ilya Dryomov 2017-07-24 15:49:52 +02:00
parent e17e8969f5
commit c7ed1a4bf4
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/ceph/crush/mapper.c
View File

@ -306,7 +306,7 @@ static __u32 *get_choose_arg_weights(const struct crush_bucket_straw2 *bucket,
const struct crush_choose_arg *arg, const struct crush_choose_arg *arg,
int position) int position)
{ {
if (!arg || !arg->weight_set || arg->weight_set_size == 0) if (!arg || !arg->weight_set)
return bucket->item_weights; return bucket->item_weights;
if (position >= arg->weight_set_size) if (position >= arg->weight_set_size)

4
net/ceph/osdmap.c
View File

@ -295,6 +295,10 @@ static int decode_choose_args(void **p, void *end, struct crush_map *c)
ret = decode_choose_arg(p, end, arg); ret = decode_choose_arg(p, end, arg);
if (ret) if (ret)
goto fail; goto fail;
if (arg->ids_size &&
arg->ids_size != c->buckets[bucket_index]->size)
goto e_inval;
} }
insert_choose_arg_map(&c->choose_args, arg_map); insert_choose_arg_map(&c->choose_args, arg_map);