Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: Delete all remaining instances of ctl_path

We don't use struct ctl_path anymore so delete the exported constants.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Eric W. Biederman and committed by
David S. Miller
a5347fe3 ec8f23ce

-58
-6
include/linux/netfilter.h
··· 154 154 int nf_register_sockopt(struct nf_sockopt_ops *reg); 155 155 void nf_unregister_sockopt(struct nf_sockopt_ops *reg); 156 156 157 - #ifdef CONFIG_SYSCTL 158 - /* Sysctl registration */ 159 - extern struct ctl_path nf_net_netfilter_sysctl_path[]; 160 - extern struct ctl_path nf_net_ipv4_netfilter_sysctl_path[]; 161 - #endif /* CONFIG_SYSCTL */ 162 - 163 157 extern struct list_head nf_hooks[NFPROTO_NUMPROTO][NF_MAX_HOOKS]; 164 158 165 159 #if defined(CONFIG_JUMP_LABEL)
-3
include/net/ip.h
··· 222 222 223 223 extern int sysctl_ip_nonlocal_bind; 224 224 225 - extern struct ctl_path net_core_path[]; 226 - extern struct ctl_path net_ipv4_ctl_path[]; 227 - 228 225 /* From inetpeer.c */ 229 226 extern int inet_peer_threshold; 230 227 extern int inet_peer_minttl;
-2
include/net/ip_vs.h
··· 10 10 11 11 #include <asm/types.h> /* for __uXX types */ 12 12 13 - #include <linux/sysctl.h> /* for ctl_path */ 14 13 #include <linux/list.h> /* for struct list_head */ 15 14 #include <linux/spinlock.h> /* for struct rwlock_t */ 16 15 #include <linux/atomic.h> /* for struct atomic_t */ ··· 1183 1184 * IPVS control data and functions (from ip_vs_ctl.c) 1184 1185 */ 1185 1186 extern struct ip_vs_stats ip_vs_stats; 1186 - extern const struct ctl_path net_vs_ctl_path[]; 1187 1187 extern int sysctl_ip_vs_sync_ver; 1188 1188 1189 1189 extern void ip_vs_sync_switch_mode(struct net *net, int mode);
-1
include/net/ipv6.h
··· 113 113 114 114 /* sysctls */ 115 115 extern int sysctl_mld_max_msf; 116 - extern struct ctl_path net_ipv6_ctl_path[]; 117 116 118 117 #define _DEVINC(net, statname, modifier, idev, field) \ 119 118 ({ \
-6
net/core/sysctl_net_core.c
··· 203 203 { } 204 204 }; 205 205 206 - __net_initdata struct ctl_path net_core_path[] = { 207 - { .procname = "net", }, 208 - { .procname = "core", }, 209 - { }, 210 - }; 211 - 212 206 static __net_init int sysctl_core_net_init(struct net *net) 213 207 { 214 208 struct ctl_table *tbl;
-10
net/ipv4/netfilter.c
··· 237 237 238 238 module_init(ipv4_netfilter_init); 239 239 module_exit(ipv4_netfilter_fini); 240 - 241 - #ifdef CONFIG_SYSCTL 242 - struct ctl_path nf_net_ipv4_netfilter_sysctl_path[] = { 243 - { .procname = "net", }, 244 - { .procname = "ipv4", }, 245 - { .procname = "netfilter", }, 246 - { } 247 - }; 248 - EXPORT_SYMBOL_GPL(nf_net_ipv4_netfilter_sysctl_path); 249 - #endif /* CONFIG_SYSCTL */
-7
net/ipv4/sysctl_net_ipv4.c
··· 768 768 { } 769 769 }; 770 770 771 - struct ctl_path net_ipv4_ctl_path[] = { 772 - { .procname = "net", }, 773 - { .procname = "ipv4", }, 774 - { }, 775 - }; 776 - EXPORT_SYMBOL_GPL(net_ipv4_ctl_path); 777 - 778 771 static __net_init int ipv4_sysctl_init_net(struct net *net) 779 772 { 780 773 struct ctl_table *table;
-7
net/ipv6/sysctl_net_ipv6.c
··· 38 38 { } 39 39 }; 40 40 41 - struct ctl_path net_ipv6_ctl_path[] = { 42 - { .procname = "net", }, 43 - { .procname = "ipv6", }, 44 - { }, 45 - }; 46 - EXPORT_SYMBOL_GPL(net_ipv6_ctl_path); 47 - 48 41 static int __net_init ipv6_sysctl_net_init(struct net *net) 49 42 { 50 43 struct ctl_table *ipv6_table;
-9
net/netfilter/core.c
··· 290 290 if (netfilter_log_init() < 0) 291 291 panic("cannot initialize nf_log"); 292 292 } 293 - 294 - #ifdef CONFIG_SYSCTL 295 - struct ctl_path nf_net_netfilter_sysctl_path[] = { 296 - { .procname = "net", }, 297 - { .procname = "netfilter", }, 298 - { } 299 - }; 300 - EXPORT_SYMBOL_GPL(nf_net_netfilter_sysctl_path); 301 - #endif /* CONFIG_SYSCTL */
-7
net/netfilter/ipvs/ip_vs_ctl.c
··· 1846 1846 { } 1847 1847 }; 1848 1848 1849 - const struct ctl_path net_vs_ctl_path[] = { 1850 - { .procname = "net", }, 1851 - { .procname = "ipv4", }, 1852 - { .procname = "vs", }, 1853 - { } 1854 - }; 1855 - EXPORT_SYMBOL_GPL(net_vs_ctl_path); 1856 1849 #endif 1857 1850 1858 1851 #ifdef CONFIG_PROC_FS