diff options
| author | Panagiotis Issaris <takis@issaris.org> | 2006-09-27 10:49:37 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-27 17:26:10 +0200 |
| commit | f8314dc60ccba7e41f425048c4160dc7f63377d5 (patch) | |
| tree | 4e361a6e93dc7f64da0244e5a0dfef1fface0ddb /fs/ext2 | |
| parent | [PATCH] more ext3 16T overflow fixes (diff) | |
| download | linux-f8314dc60ccba7e41f425048c4160dc7f63377d5.tar.xz linux-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/ext2')
| -rw-r--r-- | fs/ext2/super.c | 3 | ||||
| -rw-r--r-- | fs/ext2/xattr.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index d978d3febb8c..69435fbe53f2 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c @@ -655,11 +655,10 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) int i, j; __le32 features; - sbi = kmalloc(sizeof(*sbi), GFP_KERNEL); + sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); if (!sbi) return -ENOMEM; sb->s_fs_info = sbi; - memset(sbi, 0, sizeof(*sbi)); /* * See what the current blocksize for the device is, and diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c index 86ae8e93adb9..af52a7f8b291 100644 --- a/fs/ext2/xattr.c +++ b/fs/ext2/xattr.c @@ -521,11 +521,10 @@ bad_block: ext2_error(sb, "ext2_xattr_set", } } else { /* Allocate a buffer where we construct the new block. */ - header = kmalloc(sb->s_blocksize, GFP_KERNEL); + header = kzalloc(sb->s_blocksize, GFP_KERNEL); error = -ENOMEM; if (header == NULL) goto cleanup; - memset(header, 0, sb->s_blocksize); end = (char *)header + sb->s_blocksize; header->h_magic = cpu_to_le32(EXT2_XATTR_MAGIC); header->h_blocks = header->h_refcount = cpu_to_le32(1); |