Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux-2.6-omap-h63xx.git] / fs / xfs / linux-2.6 / xfs_sysctl.h

diff --git a/fs/xfs/linux-2.6/xfs_sysctl.h b/fs/xfs/linux-2.6/xfs_sysctl.h
index a631fb8cc5ac4c57ad04e9090184eef58fcec75a..4aadb8056c373c95b0a867e40397234e505d10ae 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_sysctl.h
+++ b/fs/xfs/linux-2.6/xfs_sysctl.h
@@ -47,6 +47,7 @@ typedef struct xfs_param {
        xfs_sysctl_val_t inherit_nosym; /* Inherit the "nosymlinks" flag. */
        xfs_sysctl_val_t rotorstep;     /* inode32 AG rotoring control knob */
        xfs_sysctl_val_t inherit_nodfrg;/* Inherit the "nodefrag" inode flag. */
+       xfs_sysctl_val_t fstrm_timer;   /* Filestream dir-AG assoc'n timeout. */
 } xfs_param_t;
 
 /*
@@ -86,15 +87,16 @@ enum {
        XFS_INHERIT_NOSYM = 19,
        XFS_ROTORSTEP = 20,
        XFS_INHERIT_NODFRG = 21,
+       XFS_FILESTREAM_TIMER = 22,
 };
 
 extern xfs_param_t     xfs_params;
 
 #ifdef CONFIG_SYSCTL
-extern void xfs_sysctl_register(void);
+extern int xfs_sysctl_register(void);
 extern void xfs_sysctl_unregister(void);
 #else
-# define xfs_sysctl_register()         do { } while (0)
+# define xfs_sysctl_register()         (0)
 # define xfs_sysctl_unregister()       do { } while (0)
 #endif /* CONFIG_SYSCTL */