[JFFS2] More message formatting cleanups

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

diff --git a/fs/jffs2/debug.h b/fs/jffs2/debug.h
index 676188e..03d9626 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.13 2005/08/17 13:42:06 dedekind Exp $
+ * $Id: debug.h,v 1.14 2005/08/17 13:48:59 dedekind Exp $
  *
  */
 #ifndef _JFFS2_DEBUG_H_
@@ -68,28 +68,28 @@
 #define JFFS2_ERROR(fmt, ...)                                          \
        do {                                                            \
                printk(JFFS2_ERR_LVL JFFS2_ERR_MSG_PREFIX               \
-                       " %d (%s): " fmt, current->pid,                 \
+                       " (%d) %s: " fmt, current->pid,                 \
                        __FUNCTION__, ##__VA_ARGS__);                   \
        } while(0)
 
 #define JFFS2_WARNING(fmt, ...)                                                \
        do {                                                            \
                printk(JFFS2_WARN_LVL JFFS2_WARN_MSG_PREFIX             \
-                       " %d (%s): " fmt, current->pid,                 \
+                       " (%d) %s: " fmt, current->pid,                 \
                        __FUNCTION__, ##__VA_ARGS__);                   \
        } while(0)
                        
 #define JFFS2_NOTICE(fmt, ...)                                         \
        do {                                                            \
                printk(JFFS2_NOTICE_LVL JFFS2_NOTICE_MSG_PREFIX         \
-                       " %d (%s): " fmt, current->pid,                 \
+                       " (%d) %s: " fmt, current->pid,                 \
                        __FUNCTION__, ##__VA_ARGS__);                   \
        } while(0)
 
 #define JFFS2_DEBUG(fmt, ...)                                          \
        do {                                                            \
                printk(JFFS2_DBG_LVL JFFS2_DBG_MSG_PREFIX               \
-                       " %d (%s): " fmt, current->pid,                 \
+                       " (%d) %s: " fmt, current->pid,                 \
                        __FUNCTION__, ##__VA_ARGS__);                   \
        } while(0)
 

diff --git a/fs/jffs2/nodelist.c b/fs/jffs2/nodelist.c
index cd366ab..0393d27 100644 (file)
--- a/fs/jffs2/nodelist.c
+++ b/fs/jffs2/nodelist.c
@@ -7,7 +7,7 @@
  *
  * For licensing information, see the file 'LICENCE' in this directory.
  *
- * $Id: nodelist.c,v 1.109 2005/08/04 11:41:30 dedekind Exp $
+ * $Id: nodelist.c,v 1.110 2005/08/17 14:13:45 dedekind Exp $
  *
  */
 
@@ -263,7 +263,7 @@ static int jffs2_add_frag_to_fragtree(struct jffs2_sb_info *c, struct rb_root *r
                                        this->ofs, this->ofs+this->size, ref_offset(this->node->raw));
                        else 
                                JFFS2_DBG_FRAGTREE2("split old hole frag 0x%04x-0x%04x\n",
-                                       this->ofs, this->ofs+this->size, ref_offset(this->node->raw));
+                                       this->ofs, this->ofs+this->size);
                        
                        /* New second frag pointing to this's node */
                        newfrag2 = new_fragment(this->node, newfrag->ofs + newfrag->size,