| From: Luis Chamberlain <mcgrof@kernel.org> |
| Subject: fs: move binfmt_misc sysctl to its own file |
| |
| kernel/sysctl.c is a kitchen sink where everyone leaves their dirty |
| dishes, this makes it very difficult to maintain. |
| |
| To help with this maintenance let's start by moving sysctls to places |
| where they actually belong. The proc sysctl maintainers do not want to |
| know what sysctl knobs you wish to add for your own piece of code, we just |
| care about the core logic. |
| |
| This moves the binfmt_misc sysctl to its own file to help remove clutter |
| from kernel/sysctl.c. |
| |
| Link: https://lkml.kernel.org/r/20211124231435.1445213-5-mcgrof@kernel.org |
| Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> |
| Cc: Al Viro <viro@zeniv.linux.org.uk> |
| Cc: Amir Goldstein <amir73il@gmail.com> |
| Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| Cc: Antti Palosaari <crope@iki.fi> |
| Cc: Arnd Bergmann <arnd@arndb.de> |
| Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> |
| Cc: Benjamin LaHaise <bcrl@kvack.org> |
| Cc: Clemens Ladisch <clemens@ladisch.de> |
| Cc: David Airlie <airlied@linux.ie> |
| Cc: Douglas Gilbert <dgilbert@interlog.com> |
| Cc: Eric Biederman <ebiederm@xmission.com> |
| Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Cc: Iurii Zaikin <yzaikin@google.com> |
| Cc: James E.J. Bottomley <jejb@linux.ibm.com> |
| Cc: Jani Nikula <jani.nikula@intel.com> |
| Cc: Jani Nikula <jani.nikula@linux.intel.com> |
| Cc: Jan Kara <jack@suse.cz> |
| Cc: Joel Becker <jlbec@evilplan.org> |
| Cc: John Ogness <john.ogness@linutronix.de> |
| Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> |
| Cc: Joseph Qi <joseph.qi@linux.alibaba.com> |
| Cc: Julia Lawall <julia.lawall@inria.fr> |
| Cc: Kees Cook <keescook@chromium.org> |
| Cc: Lukas Middendorf <kernel@tuxforce.de> |
| Cc: Mark Fasheh <mark@fasheh.com> |
| Cc: Martin K. Petersen <martin.petersen@oracle.com> |
| Cc: Paul Turner <pjt@google.com> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Petr Mladek <pmladek@suse.com> |
| Cc: Phillip Potter <phil@philpotter.co.uk> |
| Cc: Qing Wang <wangqing@vivo.com> |
| Cc: "Rafael J. Wysocki" <rafael@kernel.org> |
| Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> |
| Cc: Sebastian Reichel <sre@kernel.org> |
| Cc: Sergey Senozhatsky <senozhatsky@chromium.org> |
| Cc: Stephen Kitt <steve@sk2.org> |
| Cc: Steven Rostedt (VMware) <rostedt@goodmis.org> |
| Cc: Suren Baghdasaryan <surenb@google.com> |
| Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> |
| Cc: "Theodore Ts'o" <tytso@mit.edu> |
| Cc: Xiaoming Ni <nixiaoming@huawei.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| fs/binfmt_misc.c | 6 +++++- |
| kernel/sysctl.c | 7 ------- |
| 2 files changed, 5 insertions(+), 8 deletions(-) |
| |
| --- a/fs/binfmt_misc.c~fs-move-binfmt_misc-sysctl-to-its-own-file |
| +++ a/fs/binfmt_misc.c |
| @@ -822,7 +822,11 @@ static int __init init_misc_binfmt(void) |
| int err = register_filesystem(&bm_fs_type); |
| if (!err) |
| insert_binfmt(&misc_format); |
| - return err; |
| + if (!register_sysctl_mount_point("fs/binfmt_misc")) { |
| + pr_warn("Failed to create fs/binfmt_misc sysctl mount point"); |
| + return -ENOMEM; |
| + } |
| + return 0; |
| } |
| |
| static void __exit exit_misc_binfmt(void) |
| --- a/kernel/sysctl.c~fs-move-binfmt_misc-sysctl-to-its-own-file |
| +++ a/kernel/sysctl.c |
| @@ -3127,13 +3127,6 @@ static struct ctl_table fs_table[] = { |
| .extra1 = SYSCTL_ZERO, |
| .extra2 = SYSCTL_TWO, |
| }, |
| -#if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE) |
| - { |
| - .procname = "binfmt_misc", |
| - .mode = 0555, |
| - .child = sysctl_mount_point, |
| - }, |
| -#endif |
| { |
| .procname = "pipe-max-size", |
| .data = &pipe_max_size, |
| _ |