Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b593e48d authored by Yan Burman's avatar Yan Burman Committed by Linus Torvalds
Browse files

[PATCH] affs: replace kmalloc+memset with kzalloc 



Replace kmalloc+memset with kzalloc

Signed-off-by: default avatarYan Burman <burman.yan@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4d2d3cec

fs/affs/bitmap.c

+1 −2
Original line number Diff line number Diff line
@@ -289,12 +289,11 @@ int affs_init_bitmap(struct super_block *sb, int *flags) 
	sbi->s_bmap_count = (sbi->s_partition_size - sbi->s_reserved +

				 sbi->s_bmap_bits - 1) / sbi->s_bmap_bits;

	size = sbi->s_bmap_count * sizeof(*bm);

	bm = sbi->s_bitmap = kmalloc(size, GFP_KERNEL);

	bm = sbi->s_bitmap = kzalloc(size, GFP_KERNEL);

	if (!sbi->s_bitmap) {

		printk(KERN_ERR "AFFS: Bitmap allocation failed\n");

		return -ENOMEM;

	}

	memset(sbi->s_bitmap, 0, size);



	bmap_blk = (__be32 *)sbi->s_root_bh->b_data;

	blk = sb->s_blocksize / 4 - 49;

fs/afs/server.c

+1 −2
Original line number Diff line number Diff line
@@ -55,13 +55,12 @@ int afs_server_lookup(struct afs_cell *cell, const struct in_addr *addr, 
	_enter("%p,%08x,", cell, ntohl(addr->s_addr));



	/* allocate and initialise a server record */

	server = kmalloc(sizeof(struct afs_server), GFP_KERNEL);

	server = kzalloc(sizeof(struct afs_server), GFP_KERNEL);

	if (!server) {

		_leave(" = -ENOMEM");

		return -ENOMEM;

	}



	memset(server, 0, sizeof(struct afs_server));

	atomic_set(&server->usage, 1);



	INIT_LIST_HEAD(&server->link);

fs/afs/super.c

+1 −3
Original line number Diff line number Diff line
@@ -242,14 +242,12 @@ static int afs_fill_super(struct super_block *sb, void *data, int silent) 
	kenter("");



	/* allocate a superblock info record */

	as = kmalloc(sizeof(struct afs_super_info), GFP_KERNEL);

	as = kzalloc(sizeof(struct afs_super_info), GFP_KERNEL);

	if (!as) {

		_leave(" = -ENOMEM");

		return -ENOMEM;

	}



	memset(as, 0, sizeof(struct afs_super_info));



	afs_get_volume(params->volume);

	as->volume = params->volume;