Merge with git+ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2...

[linux-2.6] / fs / jffs2 / debug.h

diff --git a/fs/jffs2/debug.h b/fs/jffs2/debug.h
index da1417d389141fb04f22319ebf5faeb6714b5d2c..162af6dfe292c216f0c61f9a1db301b3ceb630b4 100644 (file)
--- a/fs/jffs2/debug.h
+++ b/fs/jffs2/debug.h
@@ -7,7 +7,7 @@
  *
  * For licensing information, see the file 'LICENCE' in this directory.
  *
- * $Id: debug.h,v 1.18 2005/09/21 10:26:26 dedekind Exp $
+ * $Id: debug.h,v 1.21 2005/11/07 11:14:39 gleixner Exp $
  *
  */
 #ifndef _JFFS2_DEBUG_H_
@@ -19,12 +19,12 @@
 #define CONFIG_JFFS2_FS_DEBUG 0
 #endif
 
-#if CONFIG_JFFS2_FS_DEBUG == 1
+#if CONFIG_JFFS2_FS_DEBUG > 0
 /* Enable "paranoia" checks and dumps */
 #define JFFS2_DBG_PARANOIA_CHECKS
 #define JFFS2_DBG_DUMPS
 
-/* 
+/*
  * By defining/undefining the below macros one may select debugging messages
  * fro specific JFFS2 subsystems.
  */
@@ -37,7 +37,7 @@
 #define JFFS2_DBG_FSBUILD_MESSAGES
 #endif
 
-#if CONFIG_JFFS2_FS_DEBUG == 2
+#if CONFIG_JFFS2_FS_DEBUG > 1
 #define JFFS2_DBG_FRAGTREE2_MESSAGES
 #define JFFS2_DBG_MEMALLOC_MESSAGES
 #endif
@@ -45,7 +45,7 @@
 /* Sanity checks are supposed to be light-weight and enabled by default */
 #define JFFS2_DBG_SANITY_CHECKS
 
-/* 
+/*
  * Dx() are mainly used for debugging messages, they must go away and be
  * superseded by nicer dbg_xxx() macros...
  */
@@ -82,31 +82,31 @@
        do {                                                            \
                printk(JFFS2_ERR_MSG_PREFIX                             \
                        " (%d) %s: " fmt, current->pid,                 \
-                       __FUNCTION__, ##__VA_ARGS__);                   \
+                       __FUNCTION__ , ##__VA_ARGS__);                  \
        } while(0)
 
 #define JFFS2_WARNING(fmt, ...)                                                \
        do {                                                            \
                printk(JFFS2_WARN_MSG_PREFIX                            \
                        " (%d) %s: " fmt, current->pid,                 \
-                       __FUNCTION__, ##__VA_ARGS__);                   \
+                       __FUNCTION__ , ##__VA_ARGS__);                  \
        } while(0)
-                       
+
 #define JFFS2_NOTICE(fmt, ...)                                         \
        do {                                                            \
                printk(JFFS2_NOTICE_MSG_PREFIX                          \
                        " (%d) %s: " fmt, current->pid,                 \
-                       __FUNCTION__, ##__VA_ARGS__);                   \
+                       __FUNCTION__ , ##__VA_ARGS__);                  \
        } while(0)
 
 #define JFFS2_DEBUG(fmt, ...)                                          \
        do {                                                            \
                printk(JFFS2_DBG_MSG_PREFIX                             \
                        " (%d) %s: " fmt, current->pid,                 \
-                       __FUNCTION__, ##__VA_ARGS__);                   \
+                       __FUNCTION__ , ##__VA_ARGS__);                  \
        } while(0)
 
-/* 
+/*
  * We split our debugging messages on several parts, depending on the JFFS2
  * subsystem the message belongs to.
  */