Some recent gcc warnings don't like passing string variables to
printf-like functions without using at least a "%s" format string.
Chaneg the two occurances of that in xfs to please gcc.
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
fs/xfs/linux-2.6/xfs_stats.c: In function "xfs_read_xfssta":
fs/xfs/linux-2.6/xfs_stats.c:64: warning: format not a string literal and no
format arguments
fs/xfs/linux-2.6/xfs_super.c: In function "init_xfs_fs":
fs/xfs/linux-2.6/xfs_super.c:1833: warning: format not a string literal and no
format arguments
Index: linux-2.6-xfs/fs/xfs/linux-2.6/xfs_stats.c
===================================================================
--- linux-2.6-xfs.orig/fs/xfs/linux-2.6/xfs_stats.c 2008-11-12
11:12:49.000000000 +0100
+++ linux-2.6-xfs/fs/xfs/linux-2.6/xfs_stats.c 2008-11-12 11:13:05.000000000
+0100
@@ -61,7 +61,7 @@ xfs_read_xfsstats(
/* Loop over all stats groups */
for (i=j=len = 0; i < ARRAY_SIZE(xstats); i++) {
- len += sprintf(buffer + len, xstats[i].desc);
+ len += sprintf(buffer + len, "%s", xstats[i].desc);
/* inner loop does each group */
while (j < xstats[i].endpoint) {
val = 0;
Index: linux-2.6-xfs/fs/xfs/linux-2.6/xfs_super.c
===================================================================
--- linux-2.6-xfs.orig/fs/xfs/linux-2.6/xfs_super.c 2008-11-12
11:13:11.000000000 +0100
+++ linux-2.6-xfs/fs/xfs/linux-2.6/xfs_super.c 2008-11-12 11:13:43.000000000
+0100
@@ -1827,10 +1827,9 @@ STATIC int __init
init_xfs_fs(void)
{
int error;
- static char message[] __initdata = KERN_INFO \
- XFS_VERSION_STRING " with " XFS_BUILD_OPTIONS " enabled\n";
- printk(message);
+ printk(KERN_INFO XFS_VERSION_STRING " with "
+ XFS_BUILD_OPTIONS " enabled\n");
ktrace_init(64);
vn_init();
|