From: Jan Kara <jack@suse•cz>
To: Luis Chamberlain <mcgrof@kernel•org>
Cc: jack@suse•cz, airlied@linux•ie, amir73il@gmail•com,
clemens@ladisch•de, dri-devel@lists•freedesktop.org,
phil@philpotter•co.uk, joseph.qi@linux•alibaba.com,
mark@fasheh•com, yzaikin@google•com,
joonas.lahtinen@linux•intel.com, keescook@chromium•org,
arnd@arndb•de, intel-gfx@lists•freedesktop.org,
jani.nikula@linux•intel.com, viro@zeniv•linux.org.uk,
rodrigo.vivi@intel•com, nixiaoming@huawei•com,
tvrtko.ursulin@linux•intel.com, gregkh@linuxfoundation•org,
linux-kernel@vger•kernel.org, julia.lawall@inria•fr,
ebiederm@xmission•com, linux-fsdevel@vger•kernel.org,
akpm@linux-foundation•org, linuxppc-dev@lists•ozlabs.org,
ocfs2-devel@oss•oracle.com, jlbec@evilplan•org
Subject: Re: [PATCH v2 6/8] inotify: simplify subdirectory registration with register_sysctl()
Date: Wed, 24 Nov 2021 10:44:09 +0100 [thread overview]
Message-ID: <20211124094409.GF8583@quack2.suse.cz> (raw)
In-Reply-To: <20211123202422.819032-7-mcgrof@kernel.org>
On Tue 23-11-21 12:24:20, Luis Chamberlain wrote:
> From: Xiaoming Ni <nixiaoming@huawei•com>
>
> There is no need to user boiler plate code to specify a set of base
> directories we're going to stuff sysctls under. Simplify this by using
> register_sysctl() and specifying the directory path directly.
>
> Move inotify_user sysctl to inotify_user.c while at it to remove clutter
> from kernel/sysctl.c.
>
> Signed-off-by: Xiaoming Ni <nixiaoming@huawei•com>
> [mcgrof: update commit log to reflect new path we decided to take]
> Signed-off-by: Luis Chamberlain <mcgrof@kernel•org>
This looks fishy. You register inotify_table but not fanotify_table and
remove both...
Honza
> ---
> fs/notify/inotify/inotify_user.c | 11 ++++++++++-
> include/linux/inotify.h | 3 ---
> kernel/sysctl.c | 21 ---------------------
> 3 files changed, 10 insertions(+), 25 deletions(-)
>
> diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
> index 29fca3284bb5..54583f62dc44 100644
> --- a/fs/notify/inotify/inotify_user.c
> +++ b/fs/notify/inotify/inotify_user.c
> @@ -58,7 +58,7 @@ struct kmem_cache *inotify_inode_mark_cachep __read_mostly;
> static long it_zero = 0;
> static long it_int_max = INT_MAX;
>
> -struct ctl_table inotify_table[] = {
> +static struct ctl_table inotify_table[] = {
> {
> .procname = "max_user_instances",
> .data = &init_user_ns.ucount_max[UCOUNT_INOTIFY_INSTANCES],
> @@ -87,6 +87,14 @@ struct ctl_table inotify_table[] = {
> },
> { }
> };
> +
> +static void __init inotify_sysctls_init(void)
> +{
> + register_sysctl("fs/inotify", inotify_table);
> +}
> +
> +#else
> +#define inotify_sysctls_init() do { } while (0)
> #endif /* CONFIG_SYSCTL */
>
> static inline __u32 inotify_arg_to_mask(struct inode *inode, u32 arg)
> @@ -849,6 +857,7 @@ static int __init inotify_user_setup(void)
> inotify_max_queued_events = 16384;
> init_user_ns.ucount_max[UCOUNT_INOTIFY_INSTANCES] = 128;
> init_user_ns.ucount_max[UCOUNT_INOTIFY_WATCHES] = watches_max;
> + inotify_sysctls_init();
>
> return 0;
> }
> diff --git a/include/linux/inotify.h b/include/linux/inotify.h
> index 6a24905f6e1e..8d20caa1b268 100644
> --- a/include/linux/inotify.h
> +++ b/include/linux/inotify.h
> @@ -7,11 +7,8 @@
> #ifndef _LINUX_INOTIFY_H
> #define _LINUX_INOTIFY_H
>
> -#include <linux/sysctl.h>
> #include <uapi/linux/inotify.h>
>
> -extern struct ctl_table inotify_table[]; /* for sysctl */
> -
> #define ALL_INOTIFY_BITS (IN_ACCESS | IN_MODIFY | IN_ATTRIB | IN_CLOSE_WRITE | \
> IN_CLOSE_NOWRITE | IN_OPEN | IN_MOVED_FROM | \
> IN_MOVED_TO | IN_CREATE | IN_DELETE | \
> diff --git a/kernel/sysctl.c b/kernel/sysctl.c
> index 7a90a12b9ea4..6aa67c737e4e 100644
> --- a/kernel/sysctl.c
> +++ b/kernel/sysctl.c
> @@ -125,13 +125,6 @@ static const int maxolduid = 65535;
> static const int ngroups_max = NGROUPS_MAX;
> static const int cap_last_cap = CAP_LAST_CAP;
>
> -#ifdef CONFIG_INOTIFY_USER
> -#include <linux/inotify.h>
> -#endif
> -#ifdef CONFIG_FANOTIFY
> -#include <linux/fanotify.h>
> -#endif
> -
> #ifdef CONFIG_PROC_SYSCTL
>
> /**
> @@ -3099,20 +3092,6 @@ static struct ctl_table fs_table[] = {
> .proc_handler = proc_dointvec,
> },
> #endif
> -#ifdef CONFIG_INOTIFY_USER
> - {
> - .procname = "inotify",
> - .mode = 0555,
> - .child = inotify_table,
> - },
> -#endif
> -#ifdef CONFIG_FANOTIFY
> - {
> - .procname = "fanotify",
> - .mode = 0555,
> - .child = fanotify_table,
> - },
> -#endif
> #ifdef CONFIG_EPOLL
> {
> .procname = "epoll",
> --
> 2.33.0
>
--
Jan Kara <jack@suse•com>
SUSE Labs, CR
next prev parent reply other threads:[~2021-11-24 9:46 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-23 20:24 [PATCH v2 0/8] sysctl: second set of kernel/sysctl cleanups Luis Chamberlain
2021-11-23 20:24 ` [PATCH v2 1/8] hpet: simplify subdirectory registration with register_sysctl() Luis Chamberlain
2021-11-23 20:24 ` [PATCH v2 2/8] i915: " Luis Chamberlain
2021-11-25 9:41 ` Jani Nikula
2021-11-23 20:24 ` [PATCH v2 3/8] macintosh/mac_hid.c: " Luis Chamberlain
2021-11-23 20:24 ` [PATCH v2 4/8] ocfs2: " Luis Chamberlain
2021-11-24 9:49 ` Jan Kara
2021-11-23 20:24 ` [PATCH v2 5/8] test_sysctl: " Luis Chamberlain
2021-11-23 20:24 ` [PATCH v2 6/8] inotify: " Luis Chamberlain
2021-11-24 9:44 ` Jan Kara [this message]
2021-11-24 13:40 ` Luis Chamberlain
2021-11-23 20:24 ` [PATCH v2 7/8] cdrom: " Luis Chamberlain
2021-11-25 9:23 ` Phillip Potter
2021-11-23 20:24 ` [PATCH v2 8/8] eventpoll: simplify sysctl declaration " Luis Chamberlain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211124094409.GF8583@quack2.suse.cz \
--to=jack@suse$(echo .)cz \
--cc=airlied@linux$(echo .)ie \
--cc=akpm@linux-foundation$(echo .)org \
--cc=amir73il@gmail$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=clemens@ladisch$(echo .)de \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=ebiederm@xmission$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=jani.nikula@linux$(echo .)intel.com \
--cc=jlbec@evilplan$(echo .)org \
--cc=joonas.lahtinen@linux$(echo .)intel.com \
--cc=joseph.qi@linux$(echo .)alibaba.com \
--cc=julia.lawall@inria$(echo .)fr \
--cc=keescook@chromium$(echo .)org \
--cc=linux-fsdevel@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mark@fasheh$(echo .)com \
--cc=mcgrof@kernel$(echo .)org \
--cc=nixiaoming@huawei$(echo .)com \
--cc=ocfs2-devel@oss$(echo .)oracle.com \
--cc=phil@philpotter$(echo .)co.uk \
--cc=rodrigo.vivi@intel$(echo .)com \
--cc=tvrtko.ursulin@linux$(echo .)intel.com \
--cc=viro@zeniv$(echo .)linux.org.uk \
--cc=yzaikin@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox