On Wed, Feb 12, 2003 at 08:52:36AM -0600, Dave Kleikamp wrote:
> I'm not sure what's causing the problem, but Andrew Morton send me this
> patch which gets rid of the problem for him. The fmt string that
> jfs_err() is invoked with is sufficient to identify the location, so
> __FILE__ and __LINE__ are not really needed anyway.
>
> Linus, please apply.
>
> Thanks,
> Shaggy
>
> diff -puN fs/jfs/jfs_debug.h~jfs-build-fix fs/jfs/jfs_debug.h
> --- 25/fs/jfs/jfs_debug.h~jfs-build-fix 2003-02-12 02:20:40.000000000
> -0800
> +++ 25-akpm/fs/jfs/jfs_debug.h 2003-02-12 02:20:46.000000000 -0800
> @@ -89,8 +89,7 @@ extern void dump_mem(char *label, void *
> /* error event message: e.g., i/o error */
> #define jfs_err(fmt, arg...) do { \
> if (jfsloglevel >= JFS_LOGLEVEL_ERR) \
> - printk(KERN_ERR "%s:%d " fmt "\n", \
> - __FILE__, __LINE__, ## arg); \
> + printk(KERN_ERR fmt "\n", ## arg); \
> } while (0)
>
> /*
Ah, then it's a well-known 2.95 parser bug (sorry for not looking better
at it when sending my initial report). The following alternative patch
is sufficient to fix the compilation with 2.95 (it's your choice which
of the two patches you prefer):
--- linux-2.5.60-full/fs/jfs/jfs_debug.h.old 2003-02-12 15:59:14.000000000 +0100
+++ linux-2.5.60-full/fs/jfs/jfs_debug.h 2003-02-12 15:59:35.000000000 +0100
@@ -90,7 +90,7 @@
#define jfs_err(fmt, arg...) do { \
if (jfsloglevel >= JFS_LOGLEVEL_ERR) \
printk(KERN_ERR "%s:%d " fmt "\n", \
- __FILE__, __LINE__, ## arg); \
+ __FILE__ , __LINE__ , ## arg); \
} while (0)
/*
> David Kleikamp
cu
Adrian
--"Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sat Feb 15 2003 - 22:00:42 EST