summaryrefslogtreecommitdiff
path: root/fs/minix
diff options
context:
space:
mode:
authorPanagiotis Issaris <takis@issaris.org>2006-09-27 01:49:37 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-27 08:26:10 -0700
commitf8314dc60ccba7e41f425048c4160dc7f63377d5 (patch)
tree4e361a6e93dc7f64da0244e5a0dfef1fface0ddb /fs/minix
parent32c2d2bc4bed61323f14f2a7d69ccbd567253d8a (diff)
downloadlinux-exynos-f8314dc60ccba7e41f425048c4160dc7f63377d5.tar.gz
linux-exynos-f8314dc60ccba7e41f425048c4160dc7f63377d5.tar.bz2
linux-exynos-f8314dc60ccba7e41f425048c4160dc7f63377d5.zip
[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>
Diffstat (limited to 'fs/minix')
-rw-r--r--fs/minix/inode.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/minix/inode.c b/fs/minix/inode.c
index 330ff9fc7cf0..e24be7fc0651 100644
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
@@ -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];