Replace kmalloc+memset with kzalloc
Signed-off-by: Yan Burman <[EMAIL PROTECTED]>
diff -rubp linux-2.6.19-rc5_orig/fs/jffs2/fs.c
linux-2.6.19-rc5_kzalloc/fs/jffs2/fs.c
--- linux-2.6.19-rc5_orig/fs/jffs2/fs.c 2006-11-09 12:16:20.000000000 +0200
+++ linux-2.6.19-rc5_kzalloc/fs/jffs2/fs.c 2006-11-11 22:44:04.000000000
+0200
@@ -502,12 +502,11 @@ int jffs2_do_fill_super(struct super_blo
if (ret)
return ret;
- c->inocache_list = kmalloc(INOCACHE_HASHSIZE * sizeof(struct
jffs2_inode_cache *), GFP_KERNEL);
+ c->inocache_list = kcalloc(INOCACHE_HASHSIZE, sizeof(struct
jffs2_inode_cache *), GFP_KERNEL);
if (!c->inocache_list) {
ret = -ENOMEM;
goto out_wbuf;
}
- memset(c->inocache_list, 0, INOCACHE_HASHSIZE * sizeof(struct
jffs2_inode_cache *));
jffs2_init_xattr_subsystem(c);
diff -rubp linux-2.6.19-rc5_orig/fs/jffs2/readinode.c
linux-2.6.19-rc5_kzalloc/fs/jffs2/readinode.c
--- linux-2.6.19-rc5_orig/fs/jffs2/readinode.c 2006-11-09 12:16:20.000000000
+0200
+++ linux-2.6.19-rc5_kzalloc/fs/jffs2/readinode.c 2006-11-11
22:44:04.000000000 +0200
@@ -944,13 +944,12 @@ int jffs2_do_read_inode(struct jffs2_sb_
int jffs2_do_crccheck_inode(struct jffs2_sb_info *c, struct jffs2_inode_cache
*ic)
{
struct jffs2_raw_inode n;
- struct jffs2_inode_info *f = kmalloc(sizeof(*f), GFP_KERNEL);
+ struct jffs2_inode_info *f = kzalloc(sizeof(*f), GFP_KERNEL);
int ret;
if (!f)
return -ENOMEM;
- memset(f, 0, sizeof(*f));
init_MUTEX_LOCKED(&f->sem);
f->inocache = ic;
diff -rubp linux-2.6.19-rc5_orig/fs/jffs2/scan.c
linux-2.6.19-rc5_kzalloc/fs/jffs2/scan.c
--- linux-2.6.19-rc5_orig/fs/jffs2/scan.c 2006-11-09 12:16:20.000000000
+0200
+++ linux-2.6.19-rc5_kzalloc/fs/jffs2/scan.c 2006-11-11 22:44:04.000000000
+0200
@@ -128,12 +128,11 @@ int jffs2_scan_medium(struct jffs2_sb_in
}
if (jffs2_sum_active()) {
- s = kmalloc(sizeof(struct jffs2_summary), GFP_KERNEL);
+ s = kzalloc(sizeof(struct jffs2_summary), GFP_KERNEL);
if (!s) {
JFFS2_WARNING("Can't allocate memory for summary\n");
return -ENOMEM;
}
- memset(s, 0, sizeof(struct jffs2_summary));
}
for (i=0; i<c->nr_blocks; i++) {
diff -rubp linux-2.6.19-rc5_orig/fs/jffs2/summary.c
linux-2.6.19-rc5_kzalloc/fs/jffs2/summary.c
--- linux-2.6.19-rc5_orig/fs/jffs2/summary.c 2006-11-09 12:16:20.000000000
+0200
+++ linux-2.6.19-rc5_kzalloc/fs/jffs2/summary.c 2006-11-11 22:44:04.000000000
+0200
@@ -26,15 +26,13 @@
int jffs2_sum_init(struct jffs2_sb_info *c)
{
- c->summary = kmalloc(sizeof(struct jffs2_summary), GFP_KERNEL);
+ c->summary = kzalloc(sizeof(struct jffs2_summary), GFP_KERNEL);
if (!c->summary) {
JFFS2_WARNING("Can't allocate memory for summary
information!\n");
return -ENOMEM;
}
- memset(c->summary, 0, sizeof(struct jffs2_summary));
-
c->summary->sum_buf = vmalloc(c->sector_size);
if (!c->summary->sum_buf) {
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
