From 85fa875eaa817ab7e29d6ee32983ff1d92759678 Mon Sep 17 00:00:00 2001
From: michael <trimarchi@gandalf.sssup.it>
Date: Fri, 18 Apr 2008 13:44:17 -0700
Subject: [PATCH] --- yaml --- r: 93008 b: refs/heads/master c:
 cca15841710da39490abc17f56b55703e3140955 h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/fs/jffs2/wbuf.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8af0bf89fb72..83098d990ec7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0bc88c59cc2f031a38ad5902d5764497549217c5
+refs/heads/master: cca15841710da39490abc17f56b55703e3140955
diff --git a/trunk/fs/jffs2/wbuf.c b/trunk/fs/jffs2/wbuf.c
index d1d4f27464ba..ba49f19cff85 100644
--- a/trunk/fs/jffs2/wbuf.c
+++ b/trunk/fs/jffs2/wbuf.c
@@ -1236,12 +1236,24 @@ int jffs2_dataflash_setup(struct jffs2_sb_info *c) {
 	if (!c->wbuf)
 		return -ENOMEM;
 
+#ifdef CONFIG_JFFS2_FS_WBUF_VERIFY
+	c->wbuf_verify = kmalloc(c->wbuf_pagesize, GFP_KERNEL);
+	if (!c->wbuf_verify) {
+		kfree(c->oobbuf);
+		kfree(c->wbuf);
+		return -ENOMEM;
+	}
+#endif
+
 	printk(KERN_INFO "JFFS2 write-buffering enabled buffer (%d) erasesize (%d)\n", c->wbuf_pagesize, c->sector_size);
 
 	return 0;
 }
 
 void jffs2_dataflash_cleanup(struct jffs2_sb_info *c) {
+#ifdef CONFIG_JFFS2_FS_WBUF_VERIFY
+	kfree(c->wbuf_verify);
+#endif
 	kfree(c->wbuf);
 }