iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: Delete all remaining instances of ctl_path

Browse Source 
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>
This commit is contained in:
Eric W. Biederman 2012-04-19 13:45:29 +00:00 committed by David S. Miller
parent ec8f23ce0f
commit a5347fe36b
10 changed files with 0 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/netfilter.h
View File

@ -154,12 +154,6 @@ void nf_unregister_hooks(struct nf_hook_ops *reg, unsigned int n);
int nf_register_sockopt(struct nf_sockopt_ops *reg); int nf_register_sockopt(struct nf_sockopt_ops *reg);
void nf_unregister_sockopt(struct nf_sockopt_ops *reg); void nf_unregister_sockopt(struct nf_sockopt_ops *reg);
#ifdef CONFIG_SYSCTL
/* Sysctl registration */
extern struct ctl_path nf_net_netfilter_sysctl_path[];
extern struct ctl_path nf_net_ipv4_netfilter_sysctl_path[];
#endif /* CONFIG_SYSCTL */
extern struct list_head nf_hooks[NFPROTO_NUMPROTO][NF_MAX_HOOKS]; extern struct list_head nf_hooks[NFPROTO_NUMPROTO][NF_MAX_HOOKS];
#if defined(CONFIG_JUMP_LABEL) #if defined(CONFIG_JUMP_LABEL)

3
include/net/ip.h
View File

@ -222,9 +222,6 @@ static inline int inet_is_reserved_local_port(int port)
extern int sysctl_ip_nonlocal_bind; extern int sysctl_ip_nonlocal_bind;
extern struct ctl_path net_core_path[];
extern struct ctl_path net_ipv4_ctl_path[];
/* From inetpeer.c */ /* From inetpeer.c */
extern int inet_peer_threshold; extern int inet_peer_threshold;
extern int inet_peer_minttl; extern int inet_peer_minttl;

2
include/net/ip_vs.h
View File

@ -10,7 +10,6 @@
#include <asm/types.h> /* for __uXX types */ #include <asm/types.h> /* for __uXX types */
#include <linux/sysctl.h> /* for ctl_path */
#include <linux/list.h> /* for struct list_head */ #include <linux/list.h> /* for struct list_head */
#include <linux/spinlock.h> /* for struct rwlock_t */ #include <linux/spinlock.h> /* for struct rwlock_t */
#include <linux/atomic.h> /* for struct atomic_t */ #include <linux/atomic.h> /* for struct atomic_t */
@ -1184,7 +1183,6 @@ extern void ip_vs_scheduler_err(struct ip_vs_service *svc, const char *msg);
* IPVS control data and functions (from ip_vs_ctl.c) * IPVS control data and functions (from ip_vs_ctl.c)
*/ */
extern struct ip_vs_stats ip_vs_stats; extern struct ip_vs_stats ip_vs_stats;
extern const struct ctl_path net_vs_ctl_path[];
extern int sysctl_ip_vs_sync_ver; extern int sysctl_ip_vs_sync_ver;
extern void ip_vs_sync_switch_mode(struct net *net, int mode); extern void ip_vs_sync_switch_mode(struct net *net, int mode);

1
include/net/ipv6.h
View File

@ -113,7 +113,6 @@ struct frag_hdr {
/* sysctls */ /* sysctls */
extern int sysctl_mld_max_msf; extern int sysctl_mld_max_msf;
extern struct ctl_path net_ipv6_ctl_path[];
#define _DEVINC(net, statname, modifier, idev, field) \ #define _DEVINC(net, statname, modifier, idev, field) \
({ \ ({ \

6
net/core/sysctl_net_core.c
View File

@ -203,12 +203,6 @@ static struct ctl_table netns_core_table[] = {
{ } { }
}; };
__net_initdata struct ctl_path net_core_path[] = {
{ .procname = "net", },
{ .procname = "core", },
{ },
};
static __net_init int sysctl_core_net_init(struct net *net) static __net_init int sysctl_core_net_init(struct net *net)
{ {
struct ctl_table *tbl; struct ctl_table *tbl;

10
net/ipv4/netfilter.c
View File

@ -237,13 +237,3 @@ static void ipv4_netfilter_fini(void)
module_init(ipv4_netfilter_init); module_init(ipv4_netfilter_init);
module_exit(ipv4_netfilter_fini); module_exit(ipv4_netfilter_fini);
#ifdef CONFIG_SYSCTL
struct ctl_path nf_net_ipv4_netfilter_sysctl_path[] = {
{ .procname = "net", },
{ .procname = "ipv4", },
{ .procname = "netfilter", },
{ }
};
EXPORT_SYMBOL_GPL(nf_net_ipv4_netfilter_sysctl_path);
#endif /* CONFIG_SYSCTL */

7
net/ipv4/sysctl_net_ipv4.c
View File

@ -768,13 +768,6 @@ static struct ctl_table ipv4_net_table[] = {
{ } { }
}; };
struct ctl_path net_ipv4_ctl_path[] = {
{ .procname = "net", },
{ .procname = "ipv4", },
{ },
};
EXPORT_SYMBOL_GPL(net_ipv4_ctl_path);
static __net_init int ipv4_sysctl_init_net(struct net *net) static __net_init int ipv4_sysctl_init_net(struct net *net)
{ {
struct ctl_table *table; struct ctl_table *table;

7
net/ipv6/sysctl_net_ipv6.c
View File

@ -38,13 +38,6 @@ static ctl_table ipv6_rotable[] = {
{ } { }
}; };
struct ctl_path net_ipv6_ctl_path[] = {
{ .procname = "net", },
{ .procname = "ipv6", },
{ },
};
EXPORT_SYMBOL_GPL(net_ipv6_ctl_path);
static int __net_init ipv6_sysctl_net_init(struct net *net) static int __net_init ipv6_sysctl_net_init(struct net *net)
{ {
struct ctl_table *ipv6_table; struct ctl_table *ipv6_table;

9
net/netfilter/core.c
View File

@ -290,12 +290,3 @@ void __init netfilter_init(void)
if (netfilter_log_init() < 0) if (netfilter_log_init() < 0)
panic("cannot initialize nf_log"); panic("cannot initialize nf_log");
} }
#ifdef CONFIG_SYSCTL
struct ctl_path nf_net_netfilter_sysctl_path[] = {
{ .procname = "net", },
{ .procname = "netfilter", },
{ }
};
EXPORT_SYMBOL_GPL(nf_net_netfilter_sysctl_path);
#endif /* CONFIG_SYSCTL */

7
net/netfilter/ipvs/ip_vs_ctl.c
View File

@ -1846,13 +1846,6 @@ static struct ctl_table vs_vars[] = {
{ } { }
}; };
const struct ctl_path net_vs_ctl_path[] = {
{ .procname = "net", },
{ .procname = "ipv4", },
{ .procname = "vs", },
{ }
};
EXPORT_SYMBOL_GPL(net_vs_ctl_path);
#endif #endif
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS