mtd/fs/jffs2 readinode.c,1.95,1.96

[David Woodhouse]

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

Modified Files:
	readinode.c 
Log Message:
Some unlikely().


Index: readinode.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/readinode.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- readinode.c	12 Nov 2002 11:17:29 -0000	1.95
+++ readinode.c	10 Jan 2003 16:00:42 -0000	1.96
@@ -18,6 +18,7 @@
 #include <linux/pagemap.h>
 #include <linux/mtd/mtd.h>
 #include <linux/interrupt.h>
+#include <linux/compiler.h>
 #include "nodelist.h"
 
 
@@ -99,16 +100,16 @@
 	uint32_t lastend;
 
 	newfrag = jffs2_alloc_node_frag();
-	if (!newfrag) {
+	if (unlikely(!newfrag))
 		return -ENOMEM;
-	}
 
-	if (!fn->raw) {
+	if (unlikely(!fn->raw)) {
 		printk(KERN_WARNING "dwmw2 is stupid. j_a_f_d_t_f should never happen with ->raw == NULL\n");
 		BUG();
 	}
 
-	D2(printk(KERN_DEBUG "adding node %04x-%04x @0x%08x on flash, newfrag *%p\n", fn->ofs, fn->ofs+fn->size, ref_offset(fn->raw), newfrag));
+	D2(printk(KERN_DEBUG "adding node %04x-%04x @0x%08x on flash, newfrag *%p\n",
+		  fn->ofs, fn->ofs+fn->size, ref_offset(fn->raw), newfrag));
 	
 	if (!fn->size) {
 		jffs2_free_node_frag(newfrag);