lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mlx4_core: Clean up buddy bitmap allocation

Browse Source 
- Use kcalloc() / vzalloc() instead of an extra bitmap_zero().
 - Add __GFP_NOWARN to kcalloc() since we'll try vzalloc() if it fails.

Signed-off-by: Roland Dreier <roland@purestorage.com>
This commit is contained in:
Roland Dreier
2012-08-14 15:17:10 -07:00
parent 3de819e6b6
commit 96f17d5900
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/ethernet/mellanox/mlx4/mr.c
View File

@@ -121,7 +121,7 @@ static int mlx4_buddy_init(struct mlx4_buddy *buddy, int max_order)
buddy->max_order = max_order; buddy->max_order = max_order;
spin_lock_init(&buddy->lock); spin_lock_init(&buddy->lock);
buddy->bits = kzalloc((buddy->max_order + 1) * sizeof (long *), buddy->bits = kcalloc(buddy->max_order + 1, sizeof (long *),
GFP_KERNEL); GFP_KERNEL);
buddy->num_free = kcalloc((buddy->max_order + 1), sizeof *buddy->num_free, buddy->num_free = kcalloc((buddy->max_order + 1), sizeof *buddy->num_free,
GFP_KERNEL); GFP_KERNEL);
@@ -130,13 +130,12 @@ static int mlx4_buddy_init(struct mlx4_buddy *buddy, int max_order)
for (i = 0; i <= buddy->max_order; ++i) { for (i = 0; i <= buddy->max_order; ++i) {
s = BITS_TO_LONGS(1 << (buddy->max_order - i)); s = BITS_TO_LONGS(1 << (buddy->max_order - i));
buddy->bits[i] = kmalloc(s * sizeof (long), GFP_KERNEL); buddy->bits[i] = kcalloc(s, sizeof (long), GFP_KERNEL | __GFP_NOWARN);
if (!buddy->bits[i]) { if (!buddy->bits[i]) {
buddy->bits[i] = vmalloc(s * sizeof(long)); buddy->bits[i] = vzalloc(s * sizeof(long));
if (!buddy->bits[i]) if (!buddy->bits[i])
goto err_out_free; goto err_out_free;
} }
bitmap_zero(buddy->bits[i], 1 << (buddy->max_order - i));
} }
set_bit(0, buddy->bits[buddy->max_order]); set_bit(0, buddy->bits[buddy->max_order]);