mtd/fs/jffs2 build.c, 1.73, 1.74 fs.c, 1.57, 1.58 gc.c, 1.149, 1.150 readinode.c, 1.127, 1.128 wbuf.c, 1.93, 1.94

[Artem Bityuckiy]

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

Modified Files:
	build.c fs.c gc.c readinode.c wbuf.c 
Log Message:
[JFFS2] Clean-up debugging stuff

If debugging is disabled, define debugging functions as empty macros, instead
of using Dx() explicitly.


Index: build.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/build.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- build.c	17 Jul 2005 11:54:39 -0000	1.73
+++ build.c	17 Jul 2005 12:01:42 -0000	1.74
@@ -168,7 +168,7 @@
 	c->flags &= ~JFFS2_SB_FLAG_BUILDING;
 	
 	D1(printk(KERN_DEBUG "Pass 3 complete\n"));
-	D2(jffs2_dbg_dump_block_lists(c));
+	jffs2_dbg_dump_block_lists(c);
 
 	/* Rotate the lists by some number to ensure wear levelling */
 	jffs2_rotate_lists(c);

Index: fs.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/fs.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- fs.c	17 Jul 2005 06:56:21 -0000	1.57
+++ fs.c	17 Jul 2005 12:01:42 -0000	1.58
@@ -203,7 +203,7 @@
 
 	buf->f_bavail = buf->f_bfree = avail >> PAGE_SHIFT;
 
-	D2(jffs2_dbg_dump_block_lists(c));
+	jffs2_dbg_dump_block_lists(c);
 
 	spin_unlock(&c->erase_completion_lock);
 

Index: gc.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/gc.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- gc.c	17 Jul 2005 06:56:21 -0000	1.149
+++ gc.c	17 Jul 2005 12:01:43 -0000	1.150
@@ -111,7 +111,7 @@
 		ret->wasted_size = 0;
 	}
 
-	D2(jffs2_dbg_dump_block_lists(c));
+	jffs2_dbg_dump_block_lists(c);
 	return ret;
 }
 
@@ -142,7 +142,7 @@
 		if (c->checked_ino > c->highest_ino) {
 			printk(KERN_CRIT "Checked all inodes but still 0x%x bytes of unchecked space?\n",
 			       c->unchecked_size);
-			D2(jffs2_dbg_dump_block_lists(c));
+			jffs2_dbg_dump_block_lists(c);
 			spin_unlock(&c->erase_completion_lock);
 			BUG();
 		}

Index: readinode.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/readinode.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- readinode.c	17 Jul 2005 11:13:46 -0000	1.127
+++ readinode.c	17 Jul 2005 12:01:43 -0000	1.128
@@ -92,8 +92,8 @@
 				mark_ref_normal(next->node->raw);
 		}
 	}
-	D2(jffs2_dbg_fragtree_paranoia_check(f));
-	D2(jffs2_dbg_dump_fragtree(f));
+	jffs2_dbg_fragtree_paranoia_check(f);
+	jffs2_dbg_dump_fragtree(f);
 	return 0;
 }
 

Index: wbuf.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/wbuf.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- wbuf.c	17 Jul 2005 06:56:21 -0000	1.93
+++ wbuf.c	17 Jul 2005 12:01:43 -0000	1.94
@@ -137,7 +137,7 @@
 {
 	D1(printk("About to refile bad block at %08x\n", jeb->offset));
 
-	D2(jffs2_dbg_dump_block_lists(c));
+	jffs2_dbg_dump_block_lists(c);
 	/* File the existing block on the bad_used_list.... */
 	if (c->nextblock == jeb)
 		c->nextblock = NULL;
@@ -154,7 +154,7 @@
 		c->nr_erasing_blocks++;
 		jffs2_erase_pending_trigger(c);
 	}
-	D2(jffs2_dbg_dump_block_lists(c));
+	jffs2_dbg_dump_block_lists(c);
 
 	/* Adjust its size counts accordingly */
 	c->wasted_size += jeb->free_size;