aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2008-11-27 22:23:33 -0500
committerNiv Sardi <xaiki@sgi.com>2008-11-30 19:07:37 -0500
commit65795910c1b798f8a47181b48cf6eb163a15e778 (patch)
tree1b06b5b0de03166cdb73f6c9e25dc0207e28d53f
parent6c31b93a14a453c8756ffd228e24910ffdf30c5d (diff)
[XFS] fix spurious gcc warnings
Some recent gcc warnings don't like passing string variables to printf-like functions without using at least a "%s" format string. Change the two occurances of that in xfs to please gcc. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Eric Sandeen <sandeen@sandeen.net> Signed-off-by: Niv Sardi <xaiki@sgi.com>
-rw-r--r--fs/xfs/linux-2.6/xfs_stats.c2
-rw-r--r--fs/xfs/linux-2.6/xfs_super.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/fs/xfs/linux-2.6/xfs_stats.c b/fs/xfs/linux-2.6/xfs_stats.c
index 64f4ec90b8b2..c3526d445f6a 100644
--- a/fs/xfs/linux-2.6/xfs_stats.c
+++ b/fs/xfs/linux-2.6/xfs_stats.c
@@ -61,7 +61,7 @@ xfs_read_xfsstats(
61 61
62 /* Loop over all stats groups */ 62 /* Loop over all stats groups */
63 for (i=j=len = 0; i < ARRAY_SIZE(xstats); i++) { 63 for (i=j=len = 0; i < ARRAY_SIZE(xstats); i++) {
64 len += sprintf(buffer + len, xstats[i].desc); 64 len += sprintf(buffer + len, "%s", xstats[i].desc);
65 /* inner loop does each group */ 65 /* inner loop does each group */
66 while (j < xstats[i].endpoint) { 66 while (j < xstats[i].endpoint) {
67 val = 0; 67 val = 0;
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index c3d004bc4621..cc5e07e3e7a1 100644
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -1848,10 +1848,9 @@ STATIC int __init
1848init_xfs_fs(void) 1848init_xfs_fs(void)
1849{ 1849{
1850 int error; 1850 int error;
1851 static char message[] __initdata = KERN_INFO \
1852 XFS_VERSION_STRING " with " XFS_BUILD_OPTIONS " enabled\n";
1853 1851
1854 printk(message); 1852 printk(KERN_INFO XFS_VERSION_STRING " with "
1853 XFS_BUILD_OPTIONS " enabled\n");
1855 1854
1856 ktrace_init(64); 1855 ktrace_init(64);
1857 vn_init(); 1856 vn_init();