mtd/fs/jffs2 readinode.c,1.132,1.133

lunn at infradead.org lunn at infradead.org
Sat Jul 30 11:28:27 EDT 2005


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

Modified Files:
	readinode.c 
Log Message:
__jffs2_dbg_dump_node is not guaranteed to exist so it cannot be used
unconditionally like this.


Index: readinode.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/readinode.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- readinode.c	28 Jul 2005 14:46:40 -0000	1.132
+++ readinode.c	30 Jul 2005 15:28:24 -0000	1.133
@@ -12,6 +12,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/fs.h>
 #include <linux/crc32.h>
@@ -249,7 +250,7 @@
 		if (unlikely(je32_to_cpu(rd->offset) > je32_to_cpu(rd->isize)) ||
 		    unlikely(PAD(je32_to_cpu(rd->csize) + sizeof(*rd)) != PAD(je32_to_cpu(rd->totlen)))) {
 				JFFS2_WARNING("inode node header CRC is corrupted at %#08x\n", ref_offset(ref));
-				__jffs2_dbg_dump_node(c, ref_offset(ref));
+				jffs2_dbg_dump_node(c, ref_offset(ref));
 			return 1;
 		}
 
@@ -384,7 +385,7 @@
 	if (crc32(0, un, sizeof(struct jffs2_unknown_node) - 4) != je32_to_cpu(un->hdr_crc)) {
 		/* Hmmm. This should have been caught at scan time. */
 		JFFS2_NOTICE("node header CRC failed at %#08x. But it must have been OK earlier.\n", ref_offset(ref));
-		__jffs2_dbg_dump_node(c, ref_offset(ref));
+		jffs2_dbg_dump_node(c, ref_offset(ref));
 		return 1;
 	} else {
 		switch(je16_to_cpu(un->nodetype) & JFFS2_COMPAT_MASK) {





More information about the linux-mtd-cvs mailing list