aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jffs2
diff options
context:
space:
mode:
authorArtem B. Bityutskiy <dedekind@infradead.org>2005-08-17 10:13:48 -0400
committerThomas Gleixner <tglx@mtd.linutronix.de>2005-11-06 14:27:14 -0500
commit8d5df40954281a8e0f788b311f9c08f96e530ffa (patch)
tree835fa433bd86700f9fd09864687276c7136b75ef /fs/jffs2
parent3a69e0cd22cf34920508a4032d53e41251925f53 (diff)
[JFFS2] More message formatting cleanups
Signed-off-by: Artem B. Bityutskiy <dedekind@infradead.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs/jffs2')
-rw-r--r--fs/jffs2/debug.h10
-rw-r--r--fs/jffs2/nodelist.c4
2 files changed, 7 insertions, 7 deletions
diff --git a/fs/jffs2/debug.h b/fs/jffs2/debug.h
index 676188ec7304..03d9626ad1ce 100644
--- a/fs/jffs2/debug.h
+++ b/fs/jffs2/debug.h
@@ -7,7 +7,7 @@
7 * 7 *
8 * For licensing information, see the file 'LICENCE' in this directory. 8 * For licensing information, see the file 'LICENCE' in this directory.
9 * 9 *
10 * $Id: debug.h,v 1.13 2005/08/17 13:42:06 dedekind Exp $ 10 * $Id: debug.h,v 1.14 2005/08/17 13:48:59 dedekind Exp $
11 * 11 *
12 */ 12 */
13#ifndef _JFFS2_DEBUG_H_ 13#ifndef _JFFS2_DEBUG_H_
@@ -68,28 +68,28 @@
68#define JFFS2_ERROR(fmt, ...) \ 68#define JFFS2_ERROR(fmt, ...) \
69 do { \ 69 do { \
70 printk(JFFS2_ERR_LVL JFFS2_ERR_MSG_PREFIX \ 70 printk(JFFS2_ERR_LVL JFFS2_ERR_MSG_PREFIX \
71 " %d (%s): " fmt, current->pid, \ 71 " (%d) %s: " fmt, current->pid, \
72 __FUNCTION__, ##__VA_ARGS__); \ 72 __FUNCTION__, ##__VA_ARGS__); \
73 } while(0) 73 } while(0)
74 74
75#define JFFS2_WARNING(fmt, ...) \ 75#define JFFS2_WARNING(fmt, ...) \
76 do { \ 76 do { \
77 printk(JFFS2_WARN_LVL JFFS2_WARN_MSG_PREFIX \ 77 printk(JFFS2_WARN_LVL JFFS2_WARN_MSG_PREFIX \
78 " %d (%s): " fmt, current->pid, \ 78 " (%d) %s: " fmt, current->pid, \
79 __FUNCTION__, ##__VA_ARGS__); \ 79 __FUNCTION__, ##__VA_ARGS__); \
80 } while(0) 80 } while(0)
81 81
82#define JFFS2_NOTICE(fmt, ...) \ 82#define JFFS2_NOTICE(fmt, ...) \
83 do { \ 83 do { \
84 printk(JFFS2_NOTICE_LVL JFFS2_NOTICE_MSG_PREFIX \ 84 printk(JFFS2_NOTICE_LVL JFFS2_NOTICE_MSG_PREFIX \
85 " %d (%s): " fmt, current->pid, \ 85 " (%d) %s: " fmt, current->pid, \
86 __FUNCTION__, ##__VA_ARGS__); \ 86 __FUNCTION__, ##__VA_ARGS__); \
87 } while(0) 87 } while(0)
88 88
89#define JFFS2_DEBUG(fmt, ...) \ 89#define JFFS2_DEBUG(fmt, ...) \
90 do { \ 90 do { \
91 printk(JFFS2_DBG_LVL JFFS2_DBG_MSG_PREFIX \ 91 printk(JFFS2_DBG_LVL JFFS2_DBG_MSG_PREFIX \
92 " %d (%s): " fmt, current->pid, \ 92 " (%d) %s: " fmt, current->pid, \
93 __FUNCTION__, ##__VA_ARGS__); \ 93 __FUNCTION__, ##__VA_ARGS__); \
94 } while(0) 94 } while(0)
95 95
diff --git a/fs/jffs2/nodelist.c b/fs/jffs2/nodelist.c
index cd366ab1f020..0393d27eafc7 100644
--- a/fs/jffs2/nodelist.c
+++ b/fs/jffs2/nodelist.c
@@ -7,7 +7,7 @@
7 * 7 *
8 * For licensing information, see the file 'LICENCE' in this directory. 8 * For licensing information, see the file 'LICENCE' in this directory.
9 * 9 *
10 * $Id: nodelist.c,v 1.109 2005/08/04 11:41:30 dedekind Exp $ 10 * $Id: nodelist.c,v 1.110 2005/08/17 14:13:45 dedekind Exp $
11 * 11 *
12 */ 12 */
13 13
@@ -263,7 +263,7 @@ static int jffs2_add_frag_to_fragtree(struct jffs2_sb_info *c, struct rb_root *r
263 this->ofs, this->ofs+this->size, ref_offset(this->node->raw)); 263 this->ofs, this->ofs+this->size, ref_offset(this->node->raw));
264 else 264 else
265 JFFS2_DBG_FRAGTREE2("split old hole frag 0x%04x-0x%04x\n", 265 JFFS2_DBG_FRAGTREE2("split old hole frag 0x%04x-0x%04x\n",
266 this->ofs, this->ofs+this->size, ref_offset(this->node->raw)); 266 this->ofs, this->ofs+this->size);
267 267
268 /* New second frag pointing to this's node */ 268 /* New second frag pointing to this's node */
269 newfrag2 = new_fragment(this->node, newfrag->ofs + newfrag->size, 269 newfrag2 = new_fragment(this->node, newfrag->ofs + newfrag->size,