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

Commit 7ddbead6 authored by Joe Perches's avatar Joe Perches Committed by David Woodhouse
Browse files

jffs2: use vzalloc 



Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 309b5e4e

fs/jffs2/build.c

+2 −3
Original line number Diff line number Diff line
@@ -336,14 +336,13 @@ int jffs2_do_mount_fs(struct jffs2_sb_info *c) 
	size = sizeof(struct jffs2_eraseblock) * c->nr_blocks;

#ifndef __ECOS

	if (jffs2_blocks_use_vmalloc(c))

		c->blocks = vmalloc(size);

		c->blocks = vzalloc(size);

	else

#endif

		c->blocks = kmalloc(size, GFP_KERNEL);

		c->blocks = kzalloc(size, GFP_KERNEL);

	if (!c->blocks)

		return -ENOMEM;



	memset(c->blocks, 0, size);

	for (i=0; i<c->nr_blocks; i++) {

		INIT_LIST_HEAD(&c->blocks[i].list);

		c->blocks[i].offset = i * c->sector_size;