From 06ec336ba1221a9719573037f56c32ee17600c8b Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Thu, 4 Nov 2010 20:08:02 -0700
Subject: [PATCH] --- yaml --- r: 231671 b: refs/heads/master c:
 7ddbead6e6d3c730570a215ab9a6b1d126c54d34 h: refs/heads/master i:   231669:
 b9ce933a5d5b6fb40282bf7623120bd522664765   231667:
 1693e568808f5fc73b2bfe8e7467d3e468aa3659   231663:
 9b57585712ad7998d2adb6a1bc9c9a54abf92185 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/jffs2/build.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 44fbb27ff130..61aaf72ac894 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 309b5e4e4154721f8079bc250d2233fd4b3aa039
+refs/heads/master: 7ddbead6e6d3c730570a215ab9a6b1d126c54d34
diff --git a/trunk/fs/jffs2/build.c b/trunk/fs/jffs2/build.c
index 85c6be2db02f..3005ec4520ad 100644
--- a/trunk/fs/jffs2/build.c
+++ b/trunk/fs/jffs2/build.c
@@ -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;