The patch titled
sysctl: implement CTL_UNNUMBERED
has been added to the -mm tree. Its filename is
sysctl-implement-ctl_unnumbered.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: sysctl: implement CTL_UNNUMBERED
From: Eric W. Biederman <ebiederm@xxxxxxxxxxxx>
This patch takes the CTL_UNNUMBERD concept from NFS and makes it available to
all new sysctl users.
At the same time the sysctl binary interface maintenance documentation is
updated to mention and to describe what is needed to successfully maintain the
sysctl binary interface.
Signed-off-by: Eric W. Biederman <ebiederm@xxxxxxxxxxxx>
Acked-by: Alan Cox <alan@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/lockd/svc.c | 3 ---
fs/nfs/sysctl.c | 5 -----
include/linux/sysctl.h | 14 +++++++++++---
3 files changed, 11 insertions(+), 11 deletions(-)
diff -puN fs/lockd/svc.c~sysctl-implement-ctl_unnumbered fs/lockd/svc.c
--- a/fs/lockd/svc.c~sysctl-implement-ctl_unnumbered
+++ a/fs/lockd/svc.c
@@ -353,9 +353,6 @@ EXPORT_SYMBOL(lockd_down);
* Sysctl parameters (same as module parameters, different interface).
*/
-/* Something that isn't CTL_ANY, CTL_NONE or a value that may clash. */
-#define CTL_UNNUMBERED -2
-
static ctl_table nlm_sysctls[] = {
{
.ctl_name = CTL_UNNUMBERED,
diff -puN fs/nfs/sysctl.c~sysctl-implement-ctl_unnumbered fs/nfs/sysctl.c
--- a/fs/nfs/sysctl.c~sysctl-implement-ctl_unnumbered
+++ a/fs/nfs/sysctl.c
@@ -18,11 +18,6 @@
static const int nfs_set_port_min = 0;
static const int nfs_set_port_max = 65535;
static struct ctl_table_header *nfs_callback_sysctl_table;
-/*
- * Something that isn't CTL_ANY, CTL_NONE or a value that may clash.
- * Use the same values as fs/lockd/svc.c
- */
-#define CTL_UNNUMBERED -2
static ctl_table nfs_cb_sysctls[] = {
#ifdef CONFIG_NFS_V4
diff -puN include/linux/sysctl.h~sysctl-implement-ctl_unnumbered include/linux/sysctl.h
--- a/include/linux/sysctl.h~sysctl-implement-ctl_unnumbered
+++ a/include/linux/sysctl.h
@@ -6,10 +6,17 @@
****************************************************************
****************************************************************
**
+ ** WARNING:
** The values in this file are exported to user space via
- ** the sysctl() binary interface. However this interface
- ** is unstable and deprecated and will be removed in the future.
- ** For a stable interface use /proc/sys.
+ ** the sysctl() binary interface. Do *NOT* change the
+ ** numbering of any existing values here, and do not change
+ ** any numbers within any one set of values. If you have to
+ ** have to redefine an existing interface, use a new number for it.
+ ** The kernel will then return -ENOTDIR to any application using
+ ** the old binary interface.
+ **
+ ** For new interfaces unless you really need a binary number
+ ** please use CTL_UNNUMBERED.
**
****************************************************************
****************************************************************
@@ -48,6 +55,7 @@ struct __sysctl_args {
#ifdef __KERNEL__
#define CTL_ANY -1 /* Matches any name */
#define CTL_NONE 0
+#define CTL_UNNUMBERED CTL_NONE /* sysctl without a binary number */
#endif
enum
_
Patches currently in -mm which might be from ebiederm@xxxxxxxxxxxx are
origin.patch
x86_64-irq-use-irq_domain-in-ioapic_retrigger_irq.patch
x86_64-put-more-than-one-cpu-in-target_cpus.patch
x86_64-irq-simplify-the-vector-allocator.patch
x86_64-irq-only-look-at-per_cpu-data-for-online-cpus.patch
improve-the-remove-sysctl-warnings.patch
sysctl-allow-a-zero-ctl_name-in-the-middle-of-a-sysctl-table.patch
sysctl-implement-ctl_unnumbered.patch
add-process_session-helper-routine.patch
rename-struct-namespace-to-struct-mnt_namespace.patch
add-an-identifier-to-nsproxy.patch
rename-struct-pspace-to-struct-pid_namespace.patch
add-pid_namespace-to-nsproxy.patch
use-current-nsproxy-pid_ns.patch
add-child-reaper-to-pid_namespace.patch
rename-struct-namespace-to-struct-mnt_namespace-cachefiles.patch
pidhash-temporary-debug-checks.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
