[XFS] fix compilation with CONFIG_SYSCTL=n

SGI Modid: 2.5.x-xfs:slinx:140173a

fs/xfs/linux/xfs_globals.c

@@ -37,8 +37,17 @@
 
 #include <xfs.h>
 
+/*
+ * System memory size - used to scale certain data structures in XFS.
+ */
 unsigned long	xfs_physmem;
 
+/*
+ * Tunable XFS parameters.  xfs_params is required even when CONFIG_SYSCTL=n,
+ * other XFS code uses these values.
+ */
+xfs_param_t xfs_params = { 0, 1, 0, 0, 0 };
+
 /*
  * Used to serialize atomicIncWithWrap.
  */

fs/xfs/linux/xfs_sysctl.c

@@ -34,17 +34,10 @@
 #include <linux/sysctl.h>
 #include <linux/proc_fs.h>
 
-/*
- * Tunable XFS parameters
- */
-
-extern struct xfsstats xfsstats;
 
 STATIC ulong xfs_min[XFS_PARAM] = { 0, 0, 0, 0, 0 };
 STATIC ulong xfs_max[XFS_PARAM] = { 1, 1, 1, 1, 127 };
 
-xfs_param_t xfs_params = { 0, 1, 0, 0, 0 };
-
 static struct ctl_table_header *xfs_table_header;
 
 

fs/xfs/linux/xfs_sysctl.h

@@ -64,8 +64,8 @@ extern xfs_param_t	xfs_params;
 extern void xfs_sysctl_register(void);
 extern void xfs_sysctl_unregister(void);
 #else
-static __inline void xfs_sysctl_register(void) { };
-static __inline void xfs_sysctl_unregister(void) { };
-#endif
+# define xfs_sysctl_register()		do { } while (0)
+# define xfs_sysctl_unregister()	do { } while (0)
+#endif /* CONFIG_SYSCTL */
 
 #endif /* __XFS_SYSCTL_H__ */