From patchwork Fri Mar 9 21:59:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Perches X-Patchwork-Id: 146292 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 57865B6EE7 for ; Tue, 13 Mar 2012 10:51:50 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1S7F0l-0001TN-Fj; Mon, 12 Mar 2012 23:50:43 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1S7CkC-0005nd-T1 for linux-mtd@merlin.infradead.org; Mon, 12 Mar 2012 21:25:30 +0000 Received: from perches-mx.perches.com ([206.117.179.246] helo=labridge.com) by casper.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1S67qL-0004qo-AM for linux-mtd@lists.infradead.org; Fri, 09 Mar 2012 21:59:22 +0000 Received: from [96.251.11.108] (account joe@perches.com HELO [192.168.1.162]) by labridge.com (CommuniGate Pro SMTP 5.0.14) with ESMTPA id 18901472; Fri, 09 Mar 2012 13:59:15 -0800 Message-ID: <1331330354.14442.6.camel@joe2Laptop> Subject: [PATCH l2-mtd] jffs2: Fix build when CONFIG_JFFS2_FS_DEBUG > 0 From: Joe Perches To: dedekind1@gmail.com Date: Fri, 09 Mar 2012 13:59:14 -0800 In-Reply-To: <1331294012.29445.10.camel@sauron.fi.intel.com> References: <2d68e76db16d42f451370714f03ef952e0839692.1329349881.git.joe@perches.com> <1330965033.7220.16.camel@golum> <1330966615.3140.6.camel@joe2Laptop> <1331294012.29445.10.camel@sauron.fi.intel.com> X-Mailer: Evolution 3.2.2- Mime-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20120309_215921_605080_1F590B9D X-CRM114-Status: GOOD ( 10.18 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on casper.infradead.org summary: Content analysis details: (-1.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-mtd@lists.infradead.org, David Woodhouse , linux-kernel@vger.kernel.org X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org commit c6f6dad20d71 ("jffs2: Standardize JFFS_ uses") broke the build when CONFIG_JFFS2_FS_DEBUG > 0. Similarly, commit 41f75c15285c ("jffs2: Convert printks to pr_") also broke the build. Oops. Insufficient compile testing... Signed-off-by: Joe Perches --- 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, \