Subject: Re: [xfs-masters] Re: linux-next: Tree for June 24 (XFS x2)

From: Christoph Hellwig <[email-masked]>
Date: Fri, 27 Jun 2008 15:20:13 +0200

On Tue, Jun 24, 2008 at 05:18:09PM -0700, Randy Dunlap wrote:
> XFS shows 2 build problems today.
> 
> 1. xfs_stats.h problem
> 
>   CC      fs/xfs/xfs_rtalloc.o
> In file included from /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_linux.h:91,
>                  from /local/linsrc/linux-next-20080624/fs/xfs/xfs.h:44,
>                  from /local/linsrc/linux-next-20080624/fs/xfs/xfs_rtalloc.c:18:
> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_stats.h: In function 'xfs_init_procfs':
> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_stats.h:150: error: expected ';' before '}' token
> make[3]: *** [fs/xfs/xfs_rtalloc.o] Error 1

This should fix the problem, although I can't find a way to drop
CONFIG_PROC_FS from my test config to actually verify it:

Index: linux-2.6-xfs/fs/xfs/linux-2.6/xfs_stats.h
===================================================================
--- linux-2.6-xfs.orig/fs/xfs/linux-2.6/xfs_stats.h	2008-06-27 15:16:21.000000000 +0200
+++ linux-2.6-xfs/fs/xfs/linux-2.6/xfs_stats.h	2008-06-27 15:19:18.000000000 +0200
@@ -146,11 +146,12 @@ extern void xfs_cleanup_procfs(void);
 
 static inline int xfs_init_procfs(void)
 {
-	return 0
-};
+	return 0;
+}
+
 static inline void xfs_cleanup_procfs(void)
 {
-};
+}
 
 #endif	/* !CONFIG_PROC_FS */