dm: use vmalloc_array() to simplify code
Remove array_size() calls and replace vmalloc() with vmalloc_array() to simplify the code. Signed-off-by: Qianfeng Rong <rongqianfeng@vivo.com> Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
This commit is contained in:
parent
a3191475d1
commit
c3797175b3
|
@ -590,7 +590,7 @@ static int h_init(struct smq_hash_table *ht, struct entry_space *es, unsigned in
|
|||
nr_buckets = roundup_pow_of_two(max(nr_entries / 4u, 16u));
|
||||
ht->hash_bits = __ffs(nr_buckets);
|
||||
|
||||
ht->buckets = vmalloc(array_size(nr_buckets, sizeof(*ht->buckets)));
|
||||
ht->buckets = vmalloc_array(nr_buckets, sizeof(*ht->buckets));
|
||||
if (!ht->buckets)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
|
@ -206,7 +206,7 @@ struct dm_region_hash *dm_region_hash_create(
|
|||
rh->shift = RH_HASH_SHIFT;
|
||||
rh->prime = RH_HASH_MULT;
|
||||
|
||||
rh->buckets = vmalloc(array_size(nr_buckets, sizeof(*rh->buckets)));
|
||||
rh->buckets = vmalloc_array(nr_buckets, sizeof(*rh->buckets));
|
||||
if (!rh->buckets) {
|
||||
DMERR("unable to allocate region hash bucket memory");
|
||||
kfree(rh);
|
||||
|
|
|
@ -114,8 +114,8 @@ static int alloc_region_table(struct dm_target *ti, unsigned int nr_paths)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
sctx->region_table = vmalloc(array_size(nr_slots,
|
||||
sizeof(region_table_slot_t)));
|
||||
sctx->region_table = vmalloc_array(nr_slots,
|
||||
sizeof(region_table_slot_t));
|
||||
if (!sctx->region_table) {
|
||||
ti->error = "Cannot allocate region table";
|
||||
return -ENOMEM;
|
||||
|
|
|
@ -3031,8 +3031,8 @@ static struct pool *pool_create(struct mapped_device *pool_md,
|
|||
}
|
||||
|
||||
pool->cell_sort_array =
|
||||
vmalloc(array_size(CELL_SORT_ARRAY_SIZE,
|
||||
sizeof(*pool->cell_sort_array)));
|
||||
vmalloc_array(CELL_SORT_ARRAY_SIZE,
|
||||
sizeof(*pool->cell_sort_array));
|
||||
if (!pool->cell_sort_array) {
|
||||
*error = "Error allocating cell sort array";
|
||||
err_p = ERR_PTR(-ENOMEM);
|
||||
|
|
Loading…
Reference in New Issue