aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-02-14 03:33:56 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-14 11:09:58 -0500
commit4ed075e93bad97d0fdbb8a1be62f2449988496cb (patch)
tree56896400fa63921d4d4102f89867045680e320de
parentfd6065b4fdcb64c43e400278ebd0cb56989871c3 (diff)
[PATCH] sysctl: C99 convert ctl_tables in NTFS and remove sys_sysctl support
Putting ntfs-debug under FS_NRINODE was not a kosher thing to do so don't give it any binary number. [akpm@osdl.org: build fix] Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Cc: Anton Altaparmakov <aia21@cantab.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/ntfs/sysctl.c24
1 files changed, 16 insertions, 8 deletions
diff --git a/fs/ntfs/sysctl.c b/fs/ntfs/sysctl.c
index 1c23138d00b3..4757f6b7a28c 100644
--- a/fs/ntfs/sysctl.c
+++ b/fs/ntfs/sysctl.c
@@ -33,20 +33,28 @@
33#include "sysctl.h" 33#include "sysctl.h"
34#include "debug.h" 34#include "debug.h"
35 35
36#define FS_NTFS 1
37
38/* Definition of the ntfs sysctl. */ 36/* Definition of the ntfs sysctl. */
39static ctl_table ntfs_sysctls[] = { 37static ctl_table ntfs_sysctls[] = {
40 { FS_NTFS, "ntfs-debug", /* Binary and text IDs. */ 38 {
41 &debug_msgs,sizeof(debug_msgs), /* Data pointer and size. */ 39 .ctl_name = CTL_UNNUMBERED, /* Binary and text IDs. */
42 0644, NULL, &proc_dointvec }, /* Mode, child, proc handler. */ 40 .procname = "ntfs-debug",
43 { 0 } 41 .data = &debug_msgs, /* Data pointer and size. */
42 .maxlen = sizeof(debug_msgs),
43 .mode = 0644, /* Mode, proc handler. */
44 .proc_handler = &proc_dointvec
45 },
46 {}
44}; 47};
45 48
46/* Define the parent directory /proc/sys/fs. */ 49/* Define the parent directory /proc/sys/fs. */
47static ctl_table sysctls_root[] = { 50static ctl_table sysctls_root[] = {
48 { CTL_FS, "fs", NULL, 0, 0555, ntfs_sysctls }, 51 {
49 { 0 } 52 .ctl_name = CTL_FS,
53 .procname = "fs",
54 .mode = 0555,
55 .child = ntfs_sysctls
56 },
57 {}
50}; 58};
51 59
52/* Storage for the sysctls header. */ 60/* Storage for the sysctls header. */