[PATCH] sysctl: create sys/fs/binfmt_misc as an ordinary sysctl entry (2abc26fc) · Commits · 戴 / test

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>

fs/proc/root.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -73,10 +73,6 @@ void __init proc_root_init(void)
		#endif
		#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);

kernel/sysctl.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -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 }
		};

Admin message