Commit 7ddbead6e6d3c730570a215ab9a6b1d126c54d34

Authored by Joe Perches
Committed by David Woodhouse
1 parent 309b5e4e41

jffs2: use vzalloc

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Showing 1 changed file with 2 additions and 3 deletions Side-by-side Diff

... ... @@ -336,14 +336,13 @@
336 336 size = sizeof(struct jffs2_eraseblock) * c->nr_blocks;
337 337 #ifndef __ECOS
338 338 if (jffs2_blocks_use_vmalloc(c))
339   - c->blocks = vmalloc(size);
  339 + c->blocks = vzalloc(size);
340 340 else
341 341 #endif
342   - c->blocks = kmalloc(size, GFP_KERNEL);
  342 + c->blocks = kzalloc(size, GFP_KERNEL);
343 343 if (!c->blocks)
344 344 return -ENOMEM;
345 345  
346   - memset(c->blocks, 0, size);
347 346 for (i=0; i<c->nr_blocks; i++) {
348 347 INIT_LIST_HEAD(&c->blocks[i].list);
349 348 c->blocks[i].offset = i * c->sector_size;