Linux-Fsdevel Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Xiaoming Ni <nixiaoming@huawei.com>
To: <mcgrof@kernel.org>, <keescook@chromium.org>,
<yzaikin@google.com>, <adobriyan@gmail.com>, <mingo@kernel.org>,
<peterz@infradead.org>, <akpm@linux-foundation.org>,
<yamada.masahiro@socionext.com>, <bauerman@linux.ibm.com>,
<gregkh@linuxfoundation.org>, <skhan@linuxfoundation.org>,
<dvyukov@google.com>, <svens@stackframe.org>,
<joel@joelfernandes.org>, <tglx@linutronix.de>,
<Jisheng.Zhang@synaptics.com>, <pmladek@suse.com>,
<bigeasy@linutronix.de>
Cc: <linux-kernel@vger.kernel.org>, <linux-fsdevel@vger.kernel.org>,
<nixiaoming@huawei.com>, <wangle6@huawei.com>
Subject: [PATCH 2/4] proc/sysctl: add shared variables -1
Date: Fri, 15 May 2020 12:33:42 +0800 [thread overview]
Message-ID: <1589517224-123928-3-git-send-email-nixiaoming@huawei.com> (raw)
In-Reply-To: <1589517224-123928-1-git-send-email-nixiaoming@huawei.com>
Add the shared variable SYSCTL_NEG_ONE to replace the variable neg_one
used in both sysctl_writes_strict and hung_task_warnings.
Signed-off-by: Xiaoming Ni <nixiaoming@huawei.com>
---
fs/proc/proc_sysctl.c | 2 +-
include/linux/sysctl.h | 1 +
kernel/hung_task_sysctl.c | 3 +--
kernel/sysctl.c | 3 +--
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index b6f5d45..acae1fa 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -23,7 +23,7 @@
static const struct inode_operations proc_sys_dir_operations;
/* shared constants to be used in various sysctls */
-const int sysctl_vals[] = { 0, 1, INT_MAX };
+const int sysctl_vals[] = { 0, 1, INT_MAX, -1 };
EXPORT_SYMBOL(sysctl_vals);
/* Support for permanently empty directories */
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 02fa844..6d741d6 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -41,6 +41,7 @@
#define SYSCTL_ZERO ((void *)&sysctl_vals[0])
#define SYSCTL_ONE ((void *)&sysctl_vals[1])
#define SYSCTL_INT_MAX ((void *)&sysctl_vals[2])
+#define SYSCTL_NEG_ONE ((void *)&sysctl_vals[3])
extern const int sysctl_vals[];
diff --git a/kernel/hung_task_sysctl.c b/kernel/hung_task_sysctl.c
index 5b10d4e..62a51f5 100644
--- a/kernel/hung_task_sysctl.c
+++ b/kernel/hung_task_sysctl.c
@@ -14,7 +14,6 @@
* and hung_task_check_interval_secs
*/
static unsigned long hung_task_timeout_max = (LONG_MAX / HZ);
-static int neg_one = -1;
static struct ctl_table hung_task_sysctls[] = {
{
.procname = "hung_task_panic",
@@ -55,7 +54,7 @@
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec_minmax,
- .extra1 = &neg_one,
+ .extra1 = SYSCTL_NEG_ONE,
},
{}
};
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 20adae0..01fc559 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -124,7 +124,6 @@
static int sixty = 60;
#endif
-static int __maybe_unused neg_one = -1;
static int __maybe_unused two = 2;
static int __maybe_unused four = 4;
static unsigned long zero_ul;
@@ -540,7 +539,7 @@ static int sysrq_sysctl_handler(struct ctl_table *table, int write,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec_minmax,
- .extra1 = &neg_one,
+ .extra1 = SYSCTL_NEG_ONE,
.extra2 = SYSCTL_ONE,
},
#endif
--
1.8.5.6
next prev parent reply other threads:[~2020-05-15 4:34 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-15 4:33 [PATCH 0/4] Move the sysctl interface to the corresponding feature code file Xiaoming Ni
2020-05-15 4:33 ` [PATCH 1/4] hung_task: Move hung_task sysctl interface to hung_task_sysctl.c Xiaoming Ni
2020-05-15 8:04 ` Kees Cook
2020-05-15 8:56 ` Xiaoming Ni
2020-05-15 16:03 ` Kees Cook
2020-05-15 20:21 ` Luis Chamberlain
2020-05-15 4:33 ` Xiaoming Ni [this message]
2020-05-15 8:06 ` [PATCH 2/4] proc/sysctl: add shared variables -1 Kees Cook
2020-05-15 9:06 ` Xiaoming Ni
2020-05-15 16:05 ` Kees Cook
2020-05-16 2:32 ` Xiaoming Ni
2020-05-16 2:47 ` Kees Cook
2020-05-16 3:05 ` Xiaoming Ni
2020-05-17 2:38 ` Kees Cook
2020-05-15 4:33 ` [PATCH 3/4] watchdog: move watchdog sysctl to watchdog.c Xiaoming Ni
2020-05-15 8:09 ` Kees Cook
2020-05-15 9:17 ` Xiaoming Ni
2020-05-15 4:33 ` [PATCH 4/4] sysctl: Add register_sysctl_init() interface Xiaoming Ni
2020-05-15 8:10 ` Kees Cook
2020-05-15 9:39 ` Xiaoming Ni
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=1589517224-123928-3-git-send-email-nixiaoming@huawei.com \
--to=nixiaoming@huawei.com \
--cc=Jisheng.Zhang@synaptics.com \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=bauerman@linux.ibm.com \
--cc=bigeasy@linutronix.de \
--cc=dvyukov@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=joel@joelfernandes.org \
--cc=keescook@chromium.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=pmladek@suse.com \
--cc=skhan@linuxfoundation.org \
--cc=svens@stackframe.org \
--cc=tglx@linutronix.de \
--cc=wangle6@huawei.com \
--cc=yamada.masahiro@socionext.com \
--cc=yzaikin@google.com \
--subject='Re: [PATCH 2/4] proc/sysctl: add shared variables -1' \
/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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).