Commit cf78859f authored Jan 17, 2011 by Geert Uytterhoeven Committed by Linus Torvalds Jan 17, 2011

xfs: Do not name variables "panic"



On platforms that call panic() inside their BUG() macro (m68k/sun3, and
all platforms that don't set HAVE_ARCH_BUG), compilation fails with:

| fs/xfs/support/debug.c: In function ‘xfs_cmn_err’:
| fs/xfs/support/debug.c:92: error: called object ‘panic’ is not a function

as the local variable "panic" conflicts with the "panic()" function.
Rename the local variable to resolve this.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 8c34482c

fs/xfs/support/debug.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -75,11 +75,11 @@ xfs_cmn_err(
		{
		struct va_format vaf;
		va_list args;
		int panic = 0;
		int do_panic = 0;

		if (xfs_panic_mask && (xfs_panic_mask & panic_tag)) {
		printk(KERN_ALERT "XFS: Transforming an alert into a BUG.");
		panic = 1;
		do_panic = 1;
		}

		va_start(args, fmt);
		@@ -89,7 +89,7 @@ xfs_cmn_err(
		printk(KERN_ALERT "Filesystem %s: %pV", mp->m_fsname, &vaf);
		va_end(args);

		BUG_ON(panic);
		BUG_ON(do_panic);
		}

		void

Admin message