From: wenyang.linux@foxmail.com
To: "Eric W . Biederman" <ebiederm@xmission.com>,
Luis Chamberlain <mcgrof@kernel.org>,
Kees Cook <keescook@chromium.org>,
Joel Granados <j.granados@samsung.com>,
Christian Brauner <brauner@kernel.org>
Cc: Wen Yang <wenyang.linux@foxmail.com>, Jan Kara <jack@suse.cz>,
"Darrick J. Wong" <djwong@kernel.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 8/9] fs: inotify: delete these unnecessary static variables it_zero and it_int_max
Date: Sat, 9 Mar 2024 18:31:25 +0800 [thread overview]
Message-ID: <tencent_08629E71ABB6A973832226A1D3D999DFFC09@qq.com> (raw)
In-Reply-To: <cover.1709978655.git.wenyang.linux@foxmail.com>
From: Wen Yang <wenyang.linux@foxmail.com>
Delete unnecessary static variables (it_zero and it_int_max)
and encode them directly in the table entry.
Signed-off-by: Wen Yang <wenyang.linux@foxmail.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Luis Chamberlain <mcgrof@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Joel Granados <j.granados@samsung.com>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Jan Kara <jack@suse.cz>
Cc: "Darrick J. Wong" <djwong@kernel.org>
Cc: linux-kernel@vger.kernel.org
---
fs/notify/inotify/inotify_user.c | 49 +++++++++++++-------------------
1 file changed, 20 insertions(+), 29 deletions(-)
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index 85d8fdd55329..b346d61179ea 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -55,36 +55,27 @@ struct kmem_cache *inotify_inode_mark_cachep __ro_after_init;
#include <linux/sysctl.h>
-static long it_zero = 0;
-static long it_int_max = INT_MAX;
-
static struct ctl_table inotify_table[] = {
- {
- .procname = "max_user_instances",
- .data = &init_user_ns.ucount_max[UCOUNT_INOTIFY_INSTANCES],
- .maxlen = sizeof(long),
- .mode = 0644,
- .proc_handler = proc_doulongvec_minmax,
- .extra1 = &it_zero,
- .extra2 = &it_int_max,
- },
- {
- .procname = "max_user_watches",
- .data = &init_user_ns.ucount_max[UCOUNT_INOTIFY_WATCHES],
- .maxlen = sizeof(long),
- .mode = 0644,
- .proc_handler = proc_doulongvec_minmax,
- .extra1 = &it_zero,
- .extra2 = &it_int_max,
- },
- {
- .procname = "max_queued_events",
- .data = &inotify_max_queued_events,
- .maxlen = sizeof(int),
- .mode = 0644,
- .proc_handler = proc_dointvec_minmax,
- .extra1 = SYSCTL_ZERO
- },
+ CTL_TABLE_ENTRY_MINMAX("max_user_instances",
+ &init_user_ns.ucount_max[UCOUNT_INOTIFY_INSTANCES],
+ sizeof(long),
+ 0644,
+ proc_doulongvec_minmax,
+ SYSCTL_NUMERIC_ZERO,
+ SYSCTL_NUMERIC_INT_MAX),
+ CTL_TABLE_ENTRY_MINMAX("max_user_watches",
+ &init_user_ns.ucount_max[UCOUNT_INOTIFY_WATCHES],
+ sizeof(long),
+ 0644,
+ proc_doulongvec_minmax,
+ SYSCTL_NUMERIC_ZERO,
+ SYSCTL_NUMERIC_INT_MAX),
+ CTL_TABLE_ENTRY_MIN("max_queued_events",
+ &inotify_max_queued_events,
+ sizeof(int),
+ 0644,
+ proc_dointvec_minmax,
+ SYSCTL_NUMERIC_ZERO),
};
static void __init inotify_sysctls_init(void)
--
2.25.1
next prev parent reply other threads:[~2024-03-09 10:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1709978655.git.wenyang.linux@foxmail.com>
2024-03-09 10:31 ` [PATCH v2 1/9] sysctl: support encoding values directly in the table entry wenyang.linux
2024-03-21 16:27 ` Joel Granados
2024-03-22 15:43 ` Wen Yang
2024-03-25 9:55 ` Joel Granados
2024-03-09 10:31 ` [PATCH v2 2/9] kernel/sysctl-test: add some kunit test cases for min/max detection wenyang.linux
2024-03-09 10:31 ` [PATCH v2 3/9] rxrpc: delete these unnecessary static variables n_65535, four, max_500, etc wenyang.linux
2024-03-09 10:31 ` [PATCH v2 4/9] net: ipv6: delete these unnecessary static variables two_five_five and minus_one wenyang.linux
2024-03-09 10:31 ` [PATCH v2 5/9] svcrdma: delete these unnecessary static variables min_ord, max_ord, etc wenyang.linux
2024-03-09 10:31 ` [PATCH v2 6/9] sysctl: delete these unnecessary static variables i_zero and i_one_hundred wenyang.linux
2024-03-09 10:31 ` [PATCH v2 7/9] epoll: delete these unnecessary static variables long_zero and long_max wenyang.linux
2024-03-09 10:31 ` wenyang.linux [this message]
2024-03-09 10:31 ` [PATCH v2 9/9] ucounts: delete these unnecessary static variables ue_zero and ue_int_max wenyang.linux
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=tencent_08629E71ABB6A973832226A1D3D999DFFC09@qq.com \
--to=wenyang.linux@foxmail.com \
--cc=brauner@kernel.org \
--cc=djwong@kernel.org \
--cc=ebiederm@xmission.com \
--cc=j.granados@samsung.com \
--cc=jack@suse.cz \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mcgrof@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®