mtd/fs/jffs2 debug.c,1.10,1.11 nodelist.c,1.113,1.114

Artem Bityutskiy dedekind at infradead.org
Wed Sep 21 09:28:38 EDT 2005


Update of /home/cvs/mtd/fs/jffs2
In directory phoenix.infradead.org:/tmp/cvs-serv8378

Modified Files:
	debug.c nodelist.c 
Log Message:
[JFFS2] bugfix: make JFFS2 working and compiling when write buffer is disabled
in the configuration.


Index: debug.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/debug.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- debug.c	14 Sep 2005 16:57:32 -0000	1.10
+++ debug.c	21 Sep 2005 13:28:35 -0000	1.11
@@ -15,6 +15,7 @@
 #include <linux/pagemap.h>
 #include <linux/crc32.h>
 #include <linux/jffs2.h>
+#include <linux/mtd/mtd.h>
 #include "nodelist.h"
 #include "debug.h"
 

Index: nodelist.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/nodelist.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- nodelist.c	20 Sep 2005 14:27:34 -0000	1.113
+++ nodelist.c	21 Sep 2005 13:28:35 -0000	1.114
@@ -410,6 +410,9 @@
 
 	BUG_ON(tn->csize == 0);
 
+	if (!jffs2_is_writebuffered(c))
+		goto adj_acc;
+	
 	/* Calculate how many bytes were already checked */
 	ofs = ref_offset(ref) + sizeof(struct jffs2_raw_inode);
 	len = ofs % c->wbuf_pagesize;





More information about the linux-mtd-cvs mailing list