[PATCH] fs: Conversions from kmalloc+memset to k(z|c)alloc
Conversions from kmalloc+memset to kzalloc. Signed-off-by: Panagiotis Issaris <takis@issaris.org> Jffs2-bit-acked-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committed by
Linus Torvalds

parent
32c2d2bc4b
commit
f8314dc60c
@@ -145,11 +145,10 @@ static int minix_fill_super(struct super_block *s, void *data, int silent)
|
||||
struct inode *root_inode;
|
||||
struct minix_sb_info *sbi;
|
||||
|
||||
sbi = kmalloc(sizeof(struct minix_sb_info), GFP_KERNEL);
|
||||
sbi = kzalloc(sizeof(struct minix_sb_info), GFP_KERNEL);
|
||||
if (!sbi)
|
||||
return -ENOMEM;
|
||||
s->s_fs_info = sbi;
|
||||
memset(sbi, 0, sizeof(struct minix_sb_info));
|
||||
|
||||
/* N.B. These should be compile-time tests.
|
||||
Unfortunately that is impossible. */
|
||||
@@ -207,10 +206,9 @@ static int minix_fill_super(struct super_block *s, void *data, int silent)
|
||||
if (sbi->s_imap_blocks == 0 || sbi->s_zmap_blocks == 0)
|
||||
goto out_illegal_sb;
|
||||
i = (sbi->s_imap_blocks + sbi->s_zmap_blocks) * sizeof(bh);
|
||||
map = kmalloc(i, GFP_KERNEL);
|
||||
map = kzalloc(i, GFP_KERNEL);
|
||||
if (!map)
|
||||
goto out_no_map;
|
||||
memset(map, 0, i);
|
||||
sbi->s_imap = &map[0];
|
||||
sbi->s_zmap = &map[sbi->s_imap_blocks];
|
||||
|
||||
|
Reference in New Issue
Block a user