diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2007-02-14 00:34:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-14 08:09:59 -0800 |
| commit | 2abc26fc6b6f60fc70d6957b842ef4e5f805df7b (patch) | |
| tree | 017fc02dbd50a401970f6b92224be177a85cda43 | |
| parent | a5494dcd8b92dce64317f2f7dd0d62747c54980b (diff) | |
[PATCH] sysctl: create sys/fs/binfmt_misc as an ordinary sysctl entry
binfmt_misc has a mount point in the middle of the sysctl and that mount point
is created as a proc_generic directory.
Doing it that way gets in the way of cleaning up the sysctl proc support as it
continues the existence of a horrible hack. So instead simply create the
directory as an ordinary sysctl directory. At least that removes the magic
special case.
[akpm@osdl.org: warning fix]
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/proc/root.c | 4 | ||||
| -rw-r--r-- | kernel/sysctl.c | 14 |
2 files changed, 14 insertions, 4 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index af154458b54..6ae222b509c 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -74,10 +74,6 @@ void __init proc_root_init(void) #ifdef CONFIG_SYSCTL proc_sys_root = proc_mkdir("sys", NULL); #endif -#if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE) - proc_mkdir("sys/fs", NULL); - proc_mkdir("sys/fs/binfmt_misc", NULL); -#endif proc_root_fs = proc_mkdir("fs", NULL); proc_root_driver = proc_mkdir("driver", NULL); proc_mkdir("fs/nfsd", NULL); /* somewhere for the nfsd filesystem to be mounted */ diff --git a/kernel/sysctl.c b/kernel/sysctl.c index ca376e733ce..fc2ce3d8f97 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -881,6 +881,12 @@ static ctl_table vm_table[] = { { .ctl_name = 0 } }; +#if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE) +static ctl_table binfmt_misc_table[] = { + { .ctl_name = 0 } +}; +#endif + static ctl_table fs_table[] = { { .ctl_name = FS_NRINODE, @@ -1004,6 +1010,14 @@ static ctl_table fs_table[] = { .mode = 0644, .proc_handler = &proc_dointvec, }, +#if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE) + { + .ctl_name = CTL_UNNUMBERED, + .procname = "binfmt_misc", + .mode = 0555, + .child = binfmt_misc_table, + }, +#endif { .ctl_name = 0 } }; |