diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2012-04-19 09:44:49 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-20 21:22:30 -0400 |
commit | ec8f23ce0f4005b74013d4d122e0d540397a93c9 (patch) | |
tree | c2f22aa08ad4c0197d3cb41b91cf8d436794fde1 /net/unix/sysctl_net_unix.c | |
parent | f99e8f715a5c7ebad5410b1e9b4d744ddb284f54 (diff) |
net: Convert all sysctl registrations to register_net_sysctl
This results in code with less boiler plate that is a bit easier
to read.
Additionally stops us from using compatibility code in the sysctl
core, hastening the day when the compatibility code can be removed.
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>
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
-rw-r--r-- | net/unix/sysctl_net_unix.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c index 4f6979c06f84..b34b5b9792f0 100644 --- a/net/unix/sysctl_net_unix.c +++ b/net/unix/sysctl_net_unix.c | |||
@@ -26,12 +26,6 @@ static ctl_table unix_table[] = { | |||
26 | { } | 26 | { } |
27 | }; | 27 | }; |
28 | 28 | ||
29 | static struct ctl_path unix_path[] = { | ||
30 | { .procname = "net", }, | ||
31 | { .procname = "unix", }, | ||
32 | { }, | ||
33 | }; | ||
34 | |||
35 | int __net_init unix_sysctl_register(struct net *net) | 29 | int __net_init unix_sysctl_register(struct net *net) |
36 | { | 30 | { |
37 | struct ctl_table *table; | 31 | struct ctl_table *table; |
@@ -41,7 +35,7 @@ int __net_init unix_sysctl_register(struct net *net) | |||
41 | goto err_alloc; | 35 | goto err_alloc; |
42 | 36 | ||
43 | table[0].data = &net->unx.sysctl_max_dgram_qlen; | 37 | table[0].data = &net->unx.sysctl_max_dgram_qlen; |
44 | net->unx.ctl = register_net_sysctl_table(net, unix_path, table); | 38 | net->unx.ctl = register_net_sysctl(net, "net/unix", table); |
45 | if (net->unx.ctl == NULL) | 39 | if (net->unx.ctl == NULL) |
46 | goto err_reg; | 40 | goto err_reg; |
47 | 41 | ||