aboutsummaryrefslogtreecommitdiff
path: root/fs/jffs/intrep.c
diff options
context:
space:
mode:
authorYan Burman <burman.yan@gmail.com>2006-12-06 20:40:34 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 08:39:45 -0800
commit4a08a9f68168e547c2baf100020e9b96cae5fbd1 (patch)
treeb503ce15601ab821442be14f3bfd888b3fb449cf /fs/jffs/intrep.c
parenta0172a6dd906cf813cd56aeb133a85abf9a36c8e (diff)
[PATCH] jffs: replace kmalloc+memset with kzalloc
Replace kmalloc+memset with kzalloc Signed-off-by: Yan Burman <burman.yan@gmail.com> Cc: 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/jffs/intrep.c')
-rw-r--r--fs/jffs/intrep.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/jffs/intrep.c b/fs/jffs/intrep.c
index 478a74e2e9d..d0e783f199e 100644
--- a/fs/jffs/intrep.c
+++ b/fs/jffs/intrep.c
@@ -592,7 +592,7 @@ jffs_add_virtual_root(struct jffs_control *c)
D2(printk("jffs_add_virtual_root(): "
"Creating a virtual root directory.\n"));
- if (!(root = kmalloc(sizeof(struct jffs_file), GFP_KERNEL))) {
+ if (!(root = kzalloc(sizeof(struct jffs_file), GFP_KERNEL))) {
return -ENOMEM;
}
no_jffs_file++;
@@ -604,7 +604,6 @@ jffs_add_virtual_root(struct jffs_control *c)
DJM(no_jffs_node++);
memset(node, 0, sizeof(struct jffs_node));
node->ino = JFFS_MIN_INO;
- memset(root, 0, sizeof(struct jffs_file));
root->ino = JFFS_MIN_INO;
root->mode = S_IFDIR | S_IRWXU | S_IRGRP
| S_IXGRP | S_IROTH | S_IXOTH;