diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-07-23 05:20:10 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-07-23 05:20:10 -0400 |
| commit | 39fe5434cb9de5da40510028b17b96bc4eb312b3 (patch) | |
| tree | 7a02a317b9ad57da51ca99887c119e779ccf3f13 /fs/xfs/linux-2.6/xfs_sysctl.c | |
| parent | 0fc72b81d3111d114ab378935b1cf07680ca1289 (diff) | |
| parent | f695baf2df9e0413d3521661070103711545207a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_sysctl.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_sysctl.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/fs/xfs/linux-2.6/xfs_sysctl.c b/fs/xfs/linux-2.6/xfs_sysctl.c index cd6eaa44aa2b..bb997d75c05c 100644 --- a/fs/xfs/linux-2.6/xfs_sysctl.c +++ b/fs/xfs/linux-2.6/xfs_sysctl.c | |||
| @@ -210,6 +210,17 @@ static ctl_table xfs_table[] = { | |||
| 210 | .extra1 = &xfs_params.inherit_nodfrg.min, | 210 | .extra1 = &xfs_params.inherit_nodfrg.min, |
| 211 | .extra2 = &xfs_params.inherit_nodfrg.max | 211 | .extra2 = &xfs_params.inherit_nodfrg.max |
| 212 | }, | 212 | }, |
| 213 | { | ||
| 214 | .ctl_name = XFS_FILESTREAM_TIMER, | ||
| 215 | .procname = "filestream_centisecs", | ||
| 216 | .data = &xfs_params.fstrm_timer.val, | ||
| 217 | .maxlen = sizeof(int), | ||
| 218 | .mode = 0644, | ||
| 219 | .proc_handler = &proc_dointvec_minmax, | ||
| 220 | .strategy = &sysctl_intvec, | ||
| 221 | .extra1 = &xfs_params.fstrm_timer.min, | ||
| 222 | .extra2 = &xfs_params.fstrm_timer.max, | ||
| 223 | }, | ||
| 213 | /* please keep this the last entry */ | 224 | /* please keep this the last entry */ |
| 214 | #ifdef CONFIG_PROC_FS | 225 | #ifdef CONFIG_PROC_FS |
| 215 | { | 226 | { |