diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2010-01-16 22:35:32 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-17 22:16:02 -0500 |
commit | 2c8c1e7297e19bdef3c178c3ea41d898a7716e3e (patch) | |
tree | 4d336562e8d5379732a0646e17b0bb1750111ef6 /net/unix | |
parent | 72659ecce68588b74f6c46862c2b4cec137d7a5a (diff) |
net: spread __net_init, __net_exit
__net_init/__net_exit are apparently not going away, so use them
to full extent.
In some cases __net_init was removed, because it was called from
__net_exit code.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/unix')
-rw-r--r-- | net/unix/af_unix.c | 4 | ||||
-rw-r--r-- | net/unix/sysctl_net_unix.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index f25511903115..9bc9b92bc099 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
@@ -2224,7 +2224,7 @@ static const struct net_proto_family unix_family_ops = { | |||
2224 | }; | 2224 | }; |
2225 | 2225 | ||
2226 | 2226 | ||
2227 | static int unix_net_init(struct net *net) | 2227 | static int __net_init unix_net_init(struct net *net) |
2228 | { | 2228 | { |
2229 | int error = -ENOMEM; | 2229 | int error = -ENOMEM; |
2230 | 2230 | ||
@@ -2243,7 +2243,7 @@ out: | |||
2243 | return error; | 2243 | return error; |
2244 | } | 2244 | } |
2245 | 2245 | ||
2246 | static void unix_net_exit(struct net *net) | 2246 | static void __net_exit unix_net_exit(struct net *net) |
2247 | { | 2247 | { |
2248 | unix_sysctl_unregister(net); | 2248 | unix_sysctl_unregister(net); |
2249 | proc_net_remove(net, "unix"); | 2249 | proc_net_remove(net, "unix"); |
diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c index 708f5df6b7f0..d095c7be10d0 100644 --- a/net/unix/sysctl_net_unix.c +++ b/net/unix/sysctl_net_unix.c | |||
@@ -31,7 +31,7 @@ static struct ctl_path unix_path[] = { | |||
31 | { }, | 31 | { }, |
32 | }; | 32 | }; |
33 | 33 | ||
34 | int unix_sysctl_register(struct net *net) | 34 | int __net_init unix_sysctl_register(struct net *net) |
35 | { | 35 | { |
36 | struct ctl_table *table; | 36 | struct ctl_table *table; |
37 | 37 | ||