X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fjffs2%2Fdebug.h;h=a113ecc3bafeeb5f74172d8d5eb98e09f6eb6979;hb=d67c6f869c0a7f275689855161c93d714197e052;hp=2a49f2c51a9f8a11e42d7664a7dffc7ceb60060b;hpb=6b06d2cc6d52830e3e0c001006b26255f47184dd;p=linux-2.6

diff --git a/fs/jffs2/debug.h b/fs/jffs2/debug.h
index 2a49f2c51a..a113ecc3ba 100644
--- a/fs/jffs2/debug.h
+++ b/fs/jffs2/debug.h
@@ -38,6 +38,7 @@
 
 #if CONFIG_JFFS2_FS_DEBUG > 1
 #define JFFS2_DBG_FRAGTREE2_MESSAGES
+#define JFFS2_DBG_READINODE2_MESSAGES
 #define JFFS2_DBG_MEMALLOC_MESSAGES
 #endif
 
@@ -80,29 +81,29 @@
 #define JFFS2_ERROR(fmt, ...)						\
 	do {								\
 		printk(JFFS2_ERR_MSG_PREFIX				\
-			" (%d) %s: " fmt, current->pid,			\
-			__FUNCTION__ , ##__VA_ARGS__);			\
+			" (%d) %s: " fmt, task_pid_nr(current),		\
+			__func__ , ##__VA_ARGS__);			\
 	} while(0)
 
 #define JFFS2_WARNING(fmt, ...)						\
 	do {								\
 		printk(JFFS2_WARN_MSG_PREFIX				\
-			" (%d) %s: " fmt, current->pid,			\
-			__FUNCTION__ , ##__VA_ARGS__);			\
+			" (%d) %s: " fmt, task_pid_nr(current),		\
+			__func__ , ##__VA_ARGS__);			\
 	} while(0)
 
 #define JFFS2_NOTICE(fmt, ...)						\
 	do {								\
 		printk(JFFS2_NOTICE_MSG_PREFIX				\
-			" (%d) %s: " fmt, current->pid,			\
-			__FUNCTION__ , ##__VA_ARGS__);			\
+			" (%d) %s: " fmt, task_pid_nr(current),		\
+			__func__ , ##__VA_ARGS__);			\
 	} while(0)
 
 #define JFFS2_DEBUG(fmt, ...)						\
 	do {								\
 		printk(JFFS2_DBG_MSG_PREFIX				\
-			" (%d) %s: " fmt, current->pid,			\
-			__FUNCTION__ , ##__VA_ARGS__);			\
+			" (%d) %s: " fmt, task_pid_nr(current),		\
+			__func__ , ##__VA_ARGS__);			\
 	} while(0)
 
 /*
@@ -115,6 +116,11 @@
 #else
 #define dbg_readinode(fmt, ...)
 #endif
+#ifdef JFFS2_DBG_READINODE2_MESSAGES
+#define dbg_readinode2(fmt, ...)	JFFS2_DEBUG(fmt, ##__VA_ARGS__)
+#else
+#define dbg_readinode2(fmt, ...)
+#endif
 
 /* Fragtree build debugging messages */
 #ifdef JFFS2_DBG_FRAGTREE_MESSAGES