mtd/fs/jffs2 read.c,1.28,1.29

David Woodhouse dwmw2 at infradead.org
Tue Nov 12 04:51:25 EST 2002


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

Modified Files:
	read.c 
Log Message:
cosmetics, and remove the BUG() which can't be reached

Index: read.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/read.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- read.c	8 Nov 2002 17:18:59 -0000	1.28
+++ read.c	12 Nov 2002 09:51:22 -0000	1.29
@@ -124,7 +124,8 @@
 	}
 	D2(printk(KERN_DEBUG "Data CRC matches calculated CRC %08x\n", crc));
 	if (ri->compr != JFFS2_COMPR_NONE) {
-		D2(printk(KERN_DEBUG "Decompress %d bytes from %p to %d bytes at %p\n", ri->csize, readbuf, je32_to_cpu(ri->dsize), decomprbuf)); 
+		D2(printk(KERN_DEBUG "Decompress %d bytes from %p to %d bytes at %p\n",
+			  je32_to_cpu(ri->csize), readbuf, je32_to_cpu(ri->dsize), decomprbuf)); 
 		ret = jffs2_decompress(ri->compr, readbuf, decomprbuf, je32_to_cpu(ri->csize), je32_to_cpu(ri->dsize));
 		if (ret) {
 			printk(KERN_WARNING "Error: jffs2_decompress returned %d\n", ret);
@@ -209,10 +210,7 @@
 			offset += readlen;
 			frag = frag_next(frag);
 			D2(printk(KERN_DEBUG "node read was OK. Looping\n"));
-			continue;
 		}
-		printk(KERN_CRIT "dwmw2 is stupid. Reason #5325\n");
-		BUG();
 	}
 	return 0;
 }





More information about the linux-mtd-cvs mailing list