Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764553AbXHFMq2 (ORCPT ); Mon, 6 Aug 2007 08:46:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1763969AbXHFMqS (ORCPT ); Mon, 6 Aug 2007 08:46:18 -0400 Received: from mailhub.sw.ru ([195.214.233.200]:48216 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1763636AbXHFMqP (ORCPT ); Mon, 6 Aug 2007 08:46:15 -0400 Date: Mon, 6 Aug 2007 16:45:31 +0400 From: Alexey Dobriyan To: "Eric W. Biederman" Cc: akpm@osdl.org, linux-kernel@vger.kernel.org, devel@openvz.org Subject: [PATCH 2/2] sysctl: remove CTL_UNNUMBERED Message-ID: <20070806124530.GD6634@localhost.sw.ru> References: <20070726164518.GB16937@localhost.sw.ru> <20070727145235.GC6924@localhost.sw.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20070727145235.GC6924@localhost.sw.ru> User-Agent: Mutt/1.5.11 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 21410 Lines: 718 I found why first version should be rejected, and, no, it is not documentation updates. Here is version 2: [PATCH 2/2] sysctl: remove CTL_UNNUMBERED CTL_UNNUMBERED is unneeded, because it expands to .ctl_name = 0 The same effect can be achieved by skipping .ctl_name initialization, saving one line per sysctl. Also, remove ->strategy callbacks from CTL_UNNUMBERED sysctls, because they aren't going to be called. And remove CTL_NONE, which nobody uses and is synonym for CTL_UNNUMBERED. Signed-off-by: Alexey Dobriyan --- Documentation/sysctl/ctl_unnumbered.txt | 5 ++--- arch/ia64/kernel/crash.c | 1 - arch/ia64/kernel/perfmon.c | 5 ----- arch/ia64/sn/kernel/xpc_main.c | 8 -------- arch/mips/au1000/common/power.c | 4 ---- arch/sh64/kernel/traps.c | 5 ----- drivers/char/hpet.c | 2 -- drivers/char/rtc.c | 2 -- fs/coda/sysctl.c | 4 ---- fs/lockd/svc.c | 7 ------- fs/nfs/sysctl.c | 7 ------- fs/ntfs/sysctl.c | 1 - include/linux/sysctl.h | 8 +------- kernel/sysctl.c | 28 ---------------------------- net/9p/sysctl.c | 2 -- net/core/sysctl_net_core.c | 2 -- net/ipv6/addrconf.c | 1 - net/netfilter/nf_conntrack_proto_udplite.c | 2 -- net/netfilter/nf_conntrack_standalone.c | 1 - 19 files changed, 3 insertions(+), 92 deletions(-) --- a/Documentation/sysctl/ctl_unnumbered.txt +++ b/Documentation/sysctl/ctl_unnumbered.txt @@ -3,9 +3,8 @@ Except for a few extremely rare exceptions user space applications do not use the binary sysctl interface. Instead everyone uses /proc/sys/... with readable ascii names. -Recently the kernel has started supporting setting the binary sysctl value to -CTL_UNNUMBERED so we no longer need to assign a binary sysctl path to allow -sysctls to show up in /proc/sys. +Kernel now supports sysctls without binary numbers so we no longer need to +assign them to allow sysctls to show up in /proc/sys. Assigning binary sysctl numbers is an endless source of conflicts in sysctl.h, breaking of the user space ABI (because of those conflicts), and maintenance --- a/arch/ia64/kernel/crash.c +++ b/arch/ia64/kernel/crash.c @@ -197,7 +197,6 @@ kdump_init_notifier(struct notifier_block *self, unsigned long val, void *data) #ifdef CONFIG_SYSCTL static ctl_table kdump_on_init_table[] = { { - .ctl_name = CTL_UNNUMBERED, .procname = "kdump_on_init", .data = &kdump_on_init, .maxlen = sizeof(int), --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c @@ -521,7 +521,6 @@ EXPORT_SYMBOL(pfm_sysctl); static ctl_table pfm_ctl_table[]={ { - .ctl_name = CTL_UNNUMBERED, .procname = "debug", .data = &pfm_sysctl.debug, .maxlen = sizeof(int), @@ -529,7 +528,6 @@ static ctl_table pfm_ctl_table[]={ .proc_handler = &proc_dointvec, }, { - .ctl_name = CTL_UNNUMBERED, .procname = "debug_ovfl", .data = &pfm_sysctl.debug_ovfl, .maxlen = sizeof(int), @@ -537,7 +535,6 @@ static ctl_table pfm_ctl_table[]={ .proc_handler = &proc_dointvec, }, { - .ctl_name = CTL_UNNUMBERED, .procname = "fastctxsw", .data = &pfm_sysctl.fastctxsw, .maxlen = sizeof(int), @@ -545,7 +542,6 @@ static ctl_table pfm_ctl_table[]={ .proc_handler = &proc_dointvec, }, { - .ctl_name = CTL_UNNUMBERED, .procname = "expert_mode", .data = &pfm_sysctl.expert_mode, .maxlen = sizeof(int), @@ -556,7 +552,6 @@ static ctl_table pfm_ctl_table[]={ }; static ctl_table pfm_sysctl_dir[] = { { - .ctl_name = CTL_UNNUMBERED, .procname = "perfmon", .mode = 0755, .child = pfm_ctl_table, --- a/arch/ia64/sn/kernel/xpc_main.c +++ b/arch/ia64/sn/kernel/xpc_main.c @@ -101,24 +101,20 @@ static int xpc_disengage_request_max_timelimit = 120; static ctl_table xpc_sys_xpc_hb_dir[] = { { - .ctl_name = CTL_UNNUMBERED, .procname = "hb_interval", .data = &xpc_hb_interval, .maxlen = sizeof(int), .mode = 0644, .proc_handler = &proc_dointvec_minmax, - .strategy = &sysctl_intvec, .extra1 = &xpc_hb_min_interval, .extra2 = &xpc_hb_max_interval }, { - .ctl_name = CTL_UNNUMBERED, .procname = "hb_check_interval", .data = &xpc_hb_check_interval, .maxlen = sizeof(int), .mode = 0644, .proc_handler = &proc_dointvec_minmax, - .strategy = &sysctl_intvec, .extra1 = &xpc_hb_check_min_interval, .extra2 = &xpc_hb_check_max_interval }, @@ -126,19 +122,16 @@ static ctl_table xpc_sys_xpc_hb_dir[] = { }; static ctl_table xpc_sys_xpc_dir[] = { { - .ctl_name = CTL_UNNUMBERED, .procname = "hb", .mode = 0555, .child = xpc_sys_xpc_hb_dir }, { - .ctl_name = CTL_UNNUMBERED, .procname = "disengage_request_timelimit", .data = &xpc_disengage_request_timelimit, .maxlen = sizeof(int), .mode = 0644, .proc_handler = &proc_dointvec_minmax, - .strategy = &sysctl_intvec, .extra1 = &xpc_disengage_request_min_timelimit, .extra2 = &xpc_disengage_request_max_timelimit }, @@ -146,7 +139,6 @@ static ctl_table xpc_sys_xpc_dir[] = { }; static ctl_table xpc_sys_dir[] = { { - .ctl_name = CTL_UNNUMBERED, .procname = "xpc", .mode = 0555, .child = xpc_sys_xpc_dir --- a/arch/mips/au1000/common/power.c +++ b/arch/mips/au1000/common/power.c @@ -420,7 +420,6 @@ static int pm_do_freq(ctl_table * ctl, int write, struct file *file, static struct ctl_table pm_table[] = { { - .ctl_name = CTL_UNNUMBERED, .procname = "suspend", .data = NULL, .maxlen = 0, @@ -428,7 +427,6 @@ static struct ctl_table pm_table[] = { .proc_handler = &pm_do_suspend }, { - .ctl_name = CTL_UNNUMBERED, .procname = "sleep", .data = NULL, .maxlen = 0, @@ -436,7 +434,6 @@ static struct ctl_table pm_table[] = { .proc_handler = &pm_do_sleep }, { - .ctl_name = CTL_UNNUMBERED, .procname = "freq", .data = NULL, .maxlen = 0, @@ -448,7 +445,6 @@ static struct ctl_table pm_table[] = { static struct ctl_table pm_dir_table[] = { { - .ctl_name = CTL_UNNUMBERED, .procname = "pm", .mode = 0555, .child = pm_table --- a/arch/sh64/kernel/traps.c +++ b/arch/sh64/kernel/traps.c @@ -910,7 +910,6 @@ static int misaligned_fixup(struct pt_regs *regs) static ctl_table unaligned_table[] = { { - .ctl_name = CTL_UNNUMBERED, .procname = "kernel_reports", .data = &kernel_mode_unaligned_fixup_count, .maxlen = sizeof(int), @@ -919,7 +918,6 @@ static ctl_table unaligned_table[] = { }, #if defined(CONFIG_SH64_USER_MISALIGNED_FIXUP) { - .ctl_name = CTL_UNNUMBERED, .procname = "user_reports", .data = &user_mode_unaligned_fixup_count, .maxlen = sizeof(int), @@ -927,7 +925,6 @@ static ctl_table unaligned_table[] = { .proc_handler = &proc_dointvec }, { - .ctl_name = CTL_UNNUMBERED, .procname = "user_enable", .data = &user_mode_unaligned_fixup_enable, .maxlen = sizeof(int), @@ -939,7 +936,6 @@ static ctl_table unaligned_table[] = { static ctl_table unaligned_root[] = { { - .ctl_name = CTL_UNNUMBERED, .procname = "unaligned_fixup", .mode = 0555, unaligned_table @@ -949,7 +945,6 @@ static ctl_table unaligned_root[] = { static ctl_table sh64_root[] = { { - .ctl_name = CTL_UNNUMBERED, .procname = "sh64", .mode = 0555, .child = unaligned_root --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c @@ -723,7 +723,6 @@ int hpet_control(struct hpet_task *tp, unsigned int cmd, unsigned long arg) static ctl_table hpet_table[] = { { - .ctl_name = CTL_UNNUMBERED, .procname = "max-user-freq", .data = &hpet_max_freq, .maxlen = sizeof(int), @@ -735,7 +734,6 @@ static ctl_table hpet_table[] = { static ctl_table hpet_root[] = { { - .ctl_name = CTL_UNNUMBERED, .procname = "hpet", .maxlen = 0, .mode = 0555, --- a/drivers/char/rtc.c +++ b/drivers/char/rtc.c @@ -279,7 +279,6 @@ irqreturn_t rtc_interrupt(int irq, void *dev_id) */ static ctl_table rtc_table[] = { { - .ctl_name = CTL_UNNUMBERED, .procname = "max-user-freq", .data = &rtc_max_user_freq, .maxlen = sizeof(int), @@ -291,7 +290,6 @@ static ctl_table rtc_table[] = { static ctl_table rtc_root[] = { { - .ctl_name = CTL_UNNUMBERED, .procname = "rtc", .mode = 0555, .child = rtc_table, --- a/fs/coda/sysctl.c +++ b/fs/coda/sysctl.c @@ -15,7 +15,6 @@ static struct ctl_table_header *fs_table_header; static ctl_table coda_table[] = { { - .ctl_name = CTL_UNNUMBERED, .procname = "timeout", .data = &coda_timeout, .maxlen = sizeof(int), @@ -23,7 +22,6 @@ static ctl_table coda_table[] = { .proc_handler = &proc_dointvec }, { - .ctl_name = CTL_UNNUMBERED, .procname = "hard", .data = &coda_hard, .maxlen = sizeof(int), @@ -31,7 +29,6 @@ static ctl_table coda_table[] = { .proc_handler = &proc_dointvec }, { - .ctl_name = CTL_UNNUMBERED, .procname = "fake_statfs", .data = &coda_fake_statfs, .maxlen = sizeof(int), @@ -43,7 +40,6 @@ static ctl_table coda_table[] = { static ctl_table fs_table[] = { { - .ctl_name = CTL_UNNUMBERED, .procname = "coda", .mode = 0555, .child = coda_table --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c @@ -370,7 +370,6 @@ EXPORT_SYMBOL(lockd_down); static ctl_table nlm_sysctls[] = { { - .ctl_name = CTL_UNNUMBERED, .procname = "nlm_grace_period", .data = &nlm_grace_period, .maxlen = sizeof(unsigned long), @@ -380,7 +379,6 @@ static ctl_table nlm_sysctls[] = { .extra2 = (unsigned long *) &nlm_grace_period_max, }, { - .ctl_name = CTL_UNNUMBERED, .procname = "nlm_timeout", .data = &nlm_timeout, .maxlen = sizeof(unsigned long), @@ -390,7 +388,6 @@ static ctl_table nlm_sysctls[] = { .extra2 = (unsigned long *) &nlm_timeout_max, }, { - .ctl_name = CTL_UNNUMBERED, .procname = "nlm_udpport", .data = &nlm_udpport, .maxlen = sizeof(int), @@ -400,7 +397,6 @@ static ctl_table nlm_sysctls[] = { .extra2 = (int *) &nlm_port_max, }, { - .ctl_name = CTL_UNNUMBERED, .procname = "nlm_tcpport", .data = &nlm_tcpport, .maxlen = sizeof(int), @@ -410,7 +406,6 @@ static ctl_table nlm_sysctls[] = { .extra2 = (int *) &nlm_port_max, }, { - .ctl_name = CTL_UNNUMBERED, .procname = "nsm_use_hostnames", .data = &nsm_use_hostnames, .maxlen = sizeof(int), @@ -418,7 +413,6 @@ static ctl_table nlm_sysctls[] = { .proc_handler = &proc_dointvec, }, { - .ctl_name = CTL_UNNUMBERED, .procname = "nsm_local_state", .data = &nsm_local_state, .maxlen = sizeof(int), @@ -430,7 +424,6 @@ static ctl_table nlm_sysctls[] = { static ctl_table nlm_sysctl_dir[] = { { - .ctl_name = CTL_UNNUMBERED, .procname = "nfs", .mode = 0555, .child = nlm_sysctls, --- a/fs/nfs/sysctl.c +++ b/fs/nfs/sysctl.c @@ -22,7 +22,6 @@ static struct ctl_table_header *nfs_callback_sysctl_table; static ctl_table nfs_cb_sysctls[] = { #ifdef CONFIG_NFS_V4 { - .ctl_name = CTL_UNNUMBERED, .procname = "nfs_callback_tcpport", .data = &nfs_callback_set_tcpport, .maxlen = sizeof(int), @@ -32,26 +31,21 @@ static ctl_table nfs_cb_sysctls[] = { .extra2 = (int *)&nfs_set_port_max, }, { - .ctl_name = CTL_UNNUMBERED, .procname = "idmap_cache_timeout", .data = &nfs_idmap_cache_timeout, .maxlen = sizeof(int), .mode = 0644, .proc_handler = &proc_dointvec_jiffies, - .strategy = &sysctl_jiffies, }, #endif { - .ctl_name = CTL_UNNUMBERED, .procname = "nfs_mountpoint_timeout", .data = &nfs_mountpoint_expiry_timeout, .maxlen = sizeof(nfs_mountpoint_expiry_timeout), .mode = 0644, .proc_handler = &proc_dointvec_jiffies, - .strategy = &sysctl_jiffies, }, { - .ctl_name = CTL_UNNUMBERED, .procname = "nfs_congestion_kb", .data = &nfs_congestion_kb, .maxlen = sizeof(nfs_congestion_kb), @@ -63,7 +57,6 @@ static ctl_table nfs_cb_sysctls[] = { static ctl_table nfs_cb_sysctl_dir[] = { { - .ctl_name = CTL_UNNUMBERED, .procname = "nfs", .mode = 0555, .child = nfs_cb_sysctls, --- a/fs/ntfs/sysctl.c +++ b/fs/ntfs/sysctl.c @@ -36,7 +36,6 @@ /* Definition of the ntfs sysctl. */ static ctl_table ntfs_sysctls[] = { { - .ctl_name = CTL_UNNUMBERED, /* Binary and text IDs. */ .procname = "ntfs-debug", .data = &debug_msgs, /* Data pointer and size. */ .maxlen = sizeof(debug_msgs), --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -16,7 +16,7 @@ ** the old binary interface. ** ** For new interfaces unless you really need a binary number - ** please use CTL_UNNUMBERED. + ** please do not initialize .ctl_name and .strategy . ** **************************************************************** **************************************************************** @@ -51,12 +51,6 @@ struct __sysctl_args { /* Top-level names: */ -/* For internal pattern-matching use only: */ -#ifdef __KERNEL__ -#define CTL_NONE 0 -#define CTL_UNNUMBERED CTL_NONE /* sysctl without a binary number */ -#endif - enum { CTL_KERN=1, /* General kernel info and control */ --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -222,62 +222,51 @@ static unsigned long max_wakeup_granularity_ns = 1000000000; /* 1 second */ static ctl_table kern_table[] = { #ifdef CONFIG_SCHED_DEBUG { - .ctl_name = CTL_UNNUMBERED, .procname = "sched_granularity_ns", .data = &sysctl_sched_granularity, .maxlen = sizeof(unsigned int), .mode = 0644, .proc_handler = &proc_dointvec_minmax, - .strategy = &sysctl_intvec, .extra1 = &min_sched_granularity_ns, .extra2 = &max_sched_granularity_ns, }, { - .ctl_name = CTL_UNNUMBERED, .procname = "sched_wakeup_granularity_ns", .data = &sysctl_sched_wakeup_granularity, .maxlen = sizeof(unsigned int), .mode = 0644, .proc_handler = &proc_dointvec_minmax, - .strategy = &sysctl_intvec, .extra1 = &min_wakeup_granularity_ns, .extra2 = &max_wakeup_granularity_ns, }, { - .ctl_name = CTL_UNNUMBERED, .procname = "sched_batch_wakeup_granularity_ns", .data = &sysctl_sched_batch_wakeup_granularity, .maxlen = sizeof(unsigned int), .mode = 0644, .proc_handler = &proc_dointvec_minmax, - .strategy = &sysctl_intvec, .extra1 = &min_wakeup_granularity_ns, .extra2 = &max_wakeup_granularity_ns, }, { - .ctl_name = CTL_UNNUMBERED, .procname = "sched_stat_granularity_ns", .data = &sysctl_sched_stat_granularity, .maxlen = sizeof(unsigned int), .mode = 0644, .proc_handler = &proc_dointvec_minmax, - .strategy = &sysctl_intvec, .extra1 = &min_wakeup_granularity_ns, .extra2 = &max_wakeup_granularity_ns, }, { - .ctl_name = CTL_UNNUMBERED, .procname = "sched_runtime_limit_ns", .data = &sysctl_sched_runtime_limit, .maxlen = sizeof(unsigned int), .mode = 0644, .proc_handler = &proc_dointvec_minmax, - .strategy = &sysctl_intvec, .extra1 = &min_sched_granularity_ns, .extra2 = &max_sched_granularity_ns, }, { - .ctl_name = CTL_UNNUMBERED, .procname = "sched_child_runs_first", .data = &sysctl_sched_child_runs_first, .maxlen = sizeof(unsigned int), @@ -286,7 +275,6 @@ static ctl_table kern_table[] = { }, #ifdef CONFIG_PROVE_LOCKING { - .ctl_name = CTL_UNNUMBERED, .procname = "prove_locking", .data = &prove_locking, .maxlen = sizeof(int), @@ -296,7 +284,6 @@ static ctl_table kern_table[] = { #endif #ifdef CONFIG_LOCK_STAT { - .ctl_name = CTL_UNNUMBERED, .procname = "lock_stat", .data = &lock_stat, .maxlen = sizeof(int), @@ -305,7 +292,6 @@ static ctl_table kern_table[] = { }, #endif { - .ctl_name = CTL_UNNUMBERED, .procname = "sched_features", .data = &sysctl_sched_features, .maxlen = sizeof(unsigned int), @@ -331,7 +317,6 @@ static ctl_table kern_table[] = { }, #ifdef CONFIG_AUDITSYSCALL { - .ctl_name = CTL_UNNUMBERED, .procname = "audit_argv_kb", .data = &audit_argv_kb, .maxlen = sizeof(int), @@ -377,7 +362,6 @@ static ctl_table kern_table[] = { }, #endif { - .ctl_name = CTL_UNNUMBERED, .procname = "print-fatal-signals", .data = &print_fatal_signals, .maxlen = sizeof(int), @@ -661,7 +645,6 @@ static ctl_table kern_table[] = { .proc_handler = &proc_dointvec, }, { - .ctl_name = CTL_UNNUMBERED, .procname = "kstack_depth_to_print", .data = &kstack_depth_to_print, .maxlen = sizeof(int), @@ -731,7 +714,6 @@ static ctl_table kern_table[] = { #endif #ifdef CONFIG_PROC_FS { - .ctl_name = CTL_UNNUMBERED, .procname = "maps_protect", .data = &maps_protect, .maxlen = sizeof(int), @@ -740,13 +722,11 @@ static ctl_table kern_table[] = { }, #endif { - .ctl_name = CTL_UNNUMBERED, .procname = "poweroff_cmd", .data = &poweroff_cmd, .maxlen = POWEROFF_CMD_PATH_LEN, .mode = 0644, .proc_handler = &proc_dostring, - .strategy = &sysctl_string, }, /* * NOTE: do not add new entries to this table unless you have read @@ -872,7 +852,6 @@ static ctl_table vm_table[] = { .proc_handler = &proc_dointvec, }, { - .ctl_name = CTL_UNNUMBERED, .procname = "hugepages_treat_as_movable", .data = &hugepages_treat_as_movable, .maxlen = sizeof(int), @@ -1005,18 +984,15 @@ static ctl_table vm_table[] = { #endif #ifdef CONFIG_SMP { - .ctl_name = CTL_UNNUMBERED, .procname = "stat_interval", .data = &sysctl_stat_interval, .maxlen = sizeof(sysctl_stat_interval), .mode = 0644, .proc_handler = &proc_dointvec_jiffies, - .strategy = &sysctl_jiffies, }, #endif #ifdef CONFIG_SECURITY { - .ctl_name = CTL_UNNUMBERED, .procname = "mmap_min_addr", .data = &mmap_min_addr, .maxlen = sizeof(unsigned long), @@ -1025,13 +1001,11 @@ static ctl_table vm_table[] = { }, #ifdef CONFIG_NUMA { - .ctl_name = CTL_UNNUMBERED, .procname = "numa_zonelist_order", .data = &numa_zonelist_order, .maxlen = NUMA_ZONELIST_ORDER_LEN, .mode = 0644, .proc_handler = &numa_zonelist_order_handler, - .strategy = &sysctl_string, }, #endif #endif @@ -1189,7 +1163,6 @@ static ctl_table fs_table[] = { }, #if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE) { - .ctl_name = CTL_UNNUMBERED, .procname = "binfmt_misc", .mode = 0555, .child = binfmt_misc_table, @@ -1205,7 +1178,6 @@ static ctl_table fs_table[] = { static ctl_table debug_table[] = { #ifdef CONFIG_X86 { - .ctl_name = CTL_UNNUMBERED, .procname = "exception-trace", .data = &show_unhandled_signals, .maxlen = sizeof(int), --- a/net/9p/sysctl.c +++ b/net/9p/sysctl.c @@ -31,7 +31,6 @@ static struct ctl_table p9_table[] = { #ifdef CONFIG_NET_9P_DEBUG { - .ctl_name = CTL_UNNUMBERED, .procname = "debug", .data = &p9_debug_level, .maxlen = sizeof(int), @@ -44,7 +43,6 @@ static struct ctl_table p9_table[] = { static struct ctl_table p9_net_table[] = { { - .ctl_name = CTL_UNNUMBERED, .procname = "9p", .maxlen = 0, .mode = 0555, --- a/net/core/sysctl_net_core.c +++ b/net/core/sysctl_net_core.c @@ -121,7 +121,6 @@ ctl_table core_table[] = { .proc_handler = &proc_dointvec }, { - .ctl_name = CTL_UNNUMBERED, .procname = "xfrm_larval_drop", .data = &sysctl_xfrm_larval_drop, .maxlen = sizeof(int), @@ -129,7 +128,6 @@ ctl_table core_table[] = { .proc_handler = &proc_dointvec }, { - .ctl_name = CTL_UNNUMBERED, .procname = "xfrm_acq_expires", .data = &sysctl_xfrm_acq_expires, .maxlen = sizeof(int), --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -4031,7 +4031,6 @@ static struct addrconf_sysctl_table }, #ifdef CONFIG_IPV6_OPTIMISTIC_DAD { - .ctl_name = CTL_UNNUMBERED, .procname = "optimistic_dad", .data = &ipv6_devconf.optimistic_dad, .maxlen = sizeof(int), --- a/net/netfilter/nf_conntrack_proto_udplite.c +++ b/net/netfilter/nf_conntrack_proto_udplite.c @@ -169,7 +169,6 @@ static unsigned int udplite_sysctl_table_users; static struct ctl_table_header *udplite_sysctl_header; static struct ctl_table udplite_sysctl_table[] = { { - .ctl_name = CTL_UNNUMBERED, .procname = "nf_conntrack_udplite_timeout", .data = &nf_ct_udplite_timeout, .maxlen = sizeof(unsigned int), @@ -177,7 +176,6 @@ static struct ctl_table udplite_sysctl_table[] = { .proc_handler = &proc_dointvec_jiffies, }, { - .ctl_name = CTL_UNNUMBERED, .procname = "nf_conntrack_udplite_timeout_stream", .data = &nf_ct_udplite_timeout_stream, .maxlen = sizeof(unsigned int), --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c @@ -366,7 +366,6 @@ static ctl_table nf_ct_sysctl_table[] = { .extra2 = &log_invalid_proto_max, }, { - .ctl_name = CTL_UNNUMBERED, .procname = "nf_conntrack_expect_max", .data = &nf_ct_expect_max, .maxlen = sizeof(int), - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/