Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a08a9f6 authored by Yan Burman's avatar Yan Burman Committed by Linus Torvalds
Browse files

[PATCH] jffs: replace kmalloc+memset with kzalloc 



Replace kmalloc+memset with kzalloc

Signed-off-by: default avatarYan Burman <burman.yan@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a0172a6d

fs/jffs/intrep.c

+1 −2
Original line number Diff line number Diff line
@@ -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;