[JFFS2] Debug code clean up - step 2

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

Signed-off-by: Artem B. Bityutskiy <dedekind@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

5 files changed, 13 insertions, 13 deletions

diff --git a/fs/jffs2/build.c b/fs/jffs2/build.c
index 3a0b003d73a1..b87d4010d36f 100644
--- a/fs/jffs2/build.c
+++ b/fs/jffs2/build.c
@@ -7,7 +7,7 @@
  *
  * For licensing information, see the file 'LICENCE' in this directory.
  *
- * $Id: build.c,v 1.72 2005/07/17 06:56:20 dedekind Exp $
+ * $Id: build.c,v 1.74 2005/07/17 12:01:42 dedekind Exp $
  *
  */
 
@@ -168,7 +168,7 @@ static int jffs2_build_filesystem(struct jffs2_sb_info *c)
         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);
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index 6c8a9d5d56a4..934c9f5090c8 100644
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@ -7,7 +7,7 @@
  *
  * For licensing information, see the file 'LICENCE' in this directory.
  *
- * $Id: fs.c,v 1.57 2005/07/17 06:56:21 dedekind Exp $
+ * $Id: fs.c,v 1.58 2005/07/17 12:01:42 dedekind Exp $
  *
  */
 
@@ -203,7 +203,7 @@ int jffs2_statfs(struct super_block *sb, struct kstatfs *buf)
 
         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);
 
diff --git a/fs/jffs2/gc.c b/fs/jffs2/gc.c
index 337ab49ab24b..6b5da0a1d319 100644
--- a/fs/jffs2/gc.c
+++ b/fs/jffs2/gc.c
@@ -7,7 +7,7 @@
  *
  * For licensing information, see the file 'LICENCE' in this directory.
  *
- * $Id: gc.c,v 1.149 2005/07/17 06:56:21 dedekind Exp $
+ * $Id: gc.c,v 1.150 2005/07/17 12:01:43 dedekind Exp $
  *
  */
 
@@ -111,7 +111,7 @@ again:
                 ret->wasted_size = 0;
         }
 
-        D2(jffs2_dbg_dump_block_lists(c));
+        jffs2_dbg_dump_block_lists(c);
         return ret;
 }
 
@@ -142,7 +142,7 @@ int jffs2_garbage_collect_pass(struct jffs2_sb_info *c)
                 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();
                 }
diff --git a/fs/jffs2/readinode.c b/fs/jffs2/readinode.c
index 49da1a6cfc81..02a20d7b4d5f 100644
--- a/fs/jffs2/readinode.c
+++ b/fs/jffs2/readinode.c
@@ -7,7 +7,7 @@
  *
  * For licensing information, see the file 'LICENCE' in this directory.
  *
- * $Id: readinode.c,v 1.127 2005/07/17 11:13:46 dedekind Exp $
+ * $Id: readinode.c,v 1.128 2005/07/17 12:01:43 dedekind Exp $
  *
  */
 
@@ -92,8 +92,8 @@ int jffs2_add_full_dnode_to_inode(struct jffs2_sb_info *c, struct jffs2_inode_in
                                 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;
 }
 
diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
index 85ae51d2060a..5a820f4ea358 100644
--- a/fs/jffs2/wbuf.c
+++ b/fs/jffs2/wbuf.c
@@ -9,7 +9,7 @@
  *
  * For licensing information, see the file 'LICENCE' in this directory.
  *
- * $Id: wbuf.c,v 1.93 2005/07/17 06:56:21 dedekind Exp $
+ * $Id: wbuf.c,v 1.94 2005/07/17 12:01:43 dedekind Exp $
  *
  */
 
@@ -139,7 +139,7 @@ static void jffs2_block_refile(struct jffs2_sb_info *c, struct jffs2_eraseblock
 {
         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;
@@ -156,7 +156,7 @@ static void jffs2_block_refile(struct jffs2_sb_info *c, struct jffs2_eraseblock
                 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;