linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Joe Perches <joe@perches.com>
To: dedekind1@gmail.com
Cc: David Woodhouse <dwmw2@infradead.org>,
	linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH l2-mtd] jffs2: Fix build when CONFIG_JFFS2_FS_DEBUG > 0
Date: Fri, 09 Mar 2012 13:59:14 -0800	[thread overview]
Message-ID: <1331330354.14442.6.camel@joe2Laptop> (raw)
In-Reply-To: <1331294012.29445.10.camel@sauron.fi.intel.com>

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




  parent reply	other threads:[~2012-03-09 21:59 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-15 23:56 [PATCH 0/4] jffs2: logging message neatening Joe Perches
2012-02-15 23:56 ` [PATCH 1/4] jffs2: Convert most D1/D2 macros to jffs2_dbg Joe Perches
2012-03-05 16:30   ` Artem Bityutskiy
2012-03-05 16:56     ` Joe Perches
2012-03-09 11:53       ` Artem Bityutskiy
2012-03-09 18:49         ` Joe Perches
2012-03-12 13:12           ` Artem Bityutskiy
2012-03-12 15:33             ` Joe Perches
2012-03-12 16:35               ` Artem Bityutskiy
2012-03-12 17:11                 ` Joe Perches
2012-03-13 12:39                   ` Artem Bityutskiy
2012-03-13 16:34                     ` Joe Perches
2012-03-14 10:54                       ` Artem Bityutskiy
2012-03-09 21:59         ` Joe Perches [this message]
2012-03-12 13:50           ` [PATCH l2-mtd] jffs2: Fix build when CONFIG_JFFS2_FS_DEBUG > 0 Artem Bityutskiy
2012-02-15 23:56 ` [PATCH 2/4] jffs2: Convert printks to pr_<level> Joe Perches
2012-02-15 23:56 ` [PATCH 3/4] jffs2: Use pr_fmt and remove jffs: from formats Joe Perches
2012-02-15 23:56 ` [PATCH 4/4] jffs2: Standardize JFFS_<LEVEL> uses Joe Perches
2012-02-29 12:08 ` [PATCH 0/4] jffs2: logging message neatening Artem Bityutskiy
2012-02-29 12:12   ` Artem Bityutskiy
2012-02-29 19:02   ` Joe Perches
2012-03-01  7:36     ` Artem Bityutskiy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1331330354.14442.6.camel@joe2Laptop \
    --to=joe@perches.com \
    --cc=dedekind1@gmail.com \
    --cc=dwmw2@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mtd@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).