[PATCH l2-mtd] jffs2: Fix build when CONFIG_JFFS2_FS_DEBUG > 0

Joe Perches
2012-03-09T21:59:22Z

commit c6f6dad20d71 ("jffs2: Standardize JFFS_<LEVEL> uses")
broke the build when CONFIG_JFFS2_FS_DEBUG > 0. Similarly,
commit 41f75c15285c ("jffs2: Convert printks to pr_<level>")
also broke the build.

Oops. Insufficient compile testing...

Signed-off-by: Joe Perches <joe@perches.com>
---
fs/jffs2/debug.c | 2 +-
fs/jffs2/debug.h | 5 +++++
2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/fs/jffs2/debug.c b/fs/jffs2/debug.c
index f8a99a3..1090eb6 100644
--- a/fs/jffs2/debug.c
+++ b/fs/jffs2/debug.c
@@ -267,7 +267,7 @@ void __jffs2_dbg_superblock_counts(struct jffs2_sb_info *c)
do { \
if (sz != c->sz##_size) { \
pr_warn("%s_size mismatch counted 0x%x, c->%s_size 0x%x\n", \
- #sz, #sz, sz, c->sz##_size); \
+ #sz, sz, #sz, c->sz##_size); \
dump = 1; \
} \
} while (0)
diff --git a/fs/jffs2/debug.h b/fs/jffs2/debug.h
index b154797..4fd9be4 100644
--- a/fs/jffs2/debug.h
+++ b/fs/jffs2/debug.h
@@ -69,6 +69,11 @@ do { \
pr_debug(fmt, ##__VA_ARGS__); \
} while (0)

+/* The prefixes of JFFS2 messages */
+#define JFFS2_DBG KERN_DEBUG
+#define JFFS2_DBG_PREFIX "[JFFS2 DBG]"
+#define JFFS2_DBG_MSG_PREFIX JFFS2_DBG JFFS2_DBG_PREFIX
+
/* JFFS2 message macros */
#define JFFS2_ERROR(fmt, ...) \
pr_err("error: (%d) %s: " fmt, \
--
1.7.8.111.gad25c.dirty