Re: [PATCH 40/49] fs/udf: Use vzalloc

From: Jan Kara
Date: Fri Nov 05 2010 - 05:13:33 EST


On Thu 04-11-10 20:08:04, Joe Perches wrote:
> Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
> ---
> fs/udf/super.c | 5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
I've merged the patch into my tree.

Honza

>
> diff --git a/fs/udf/super.c b/fs/udf/super.c
> index 4a5c7c6..6e07d99 100644
> --- a/fs/udf/super.c
> +++ b/fs/udf/super.c
> @@ -959,9 +959,9 @@ static struct udf_bitmap *udf_sb_alloc_bitmap(struct super_block *sb, u32 index)
> (sizeof(struct buffer_head *) * nr_groups);
>
> if (size <= PAGE_SIZE)
> - bitmap = kmalloc(size, GFP_KERNEL);
> + bitmap = kzalloc(size, GFP_KERNEL);
> else
> - bitmap = vmalloc(size); /* TODO: get rid of vmalloc */
> + bitmap = vzalloc(size); /* TODO: get rid of vmalloc */
>
> if (bitmap == NULL) {
> udf_error(sb, __func__,
> @@ -970,7 +970,6 @@ static struct udf_bitmap *udf_sb_alloc_bitmap(struct super_block *sb, u32 index)
> return NULL;
> }
>
> - memset(bitmap, 0x00, size);
> bitmap->s_block_bitmap = (struct buffer_head **)(bitmap + 1);
> bitmap->s_nr_groups = nr_groups;
> return bitmap;
> --
> 1.7.3.1.g432b3.dirty
>
--
Jan Kara <jack@xxxxxxx>
SUSE Labs, CR
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/