mtd/fs/jffs2 gc.c,1.52.2.3,1.52.2.4

[David Woodhouse]

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

Modified Files:
      Tag: jffs2-2_4-branch
	gc.c 
Log Message:
Remove unlikely() from the 2.4 branch.


Index: gc.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/gc.c,v
retrieving revision 1.52.2.3
retrieving revision 1.52.2.4
diff -u -r1.52.2.3 -r1.52.2.4
--- gc.c	12 May 2002 17:27:08 -0000	1.52.2.3
+++ gc.c	15 May 2002 12:51:23 -0000	1.52.2.4
@@ -507,7 +507,7 @@
 	 * number as before. (Except in case of error -- see 'goto fill;' 
 	 * above.)
 	 */
-	D1(if(unlikely(fn->frags <= 1)) {
+	D1(if(fn->frags <= 1) {
 		printk(KERN_WARNING "jffs2_garbage_collect_hole: Replacing fn with %d frag(s) but new ver %d != highest_version %d of ino #%d\n",
 		       fn->frags, ri.version, f->highest_version, ri.ino);
 	});