diff options
Diffstat (limited to 'net/unix')
| -rw-r--r-- | net/unix/af_unix.c | 6 | ||||
| -rw-r--r-- | net/unix/sysctl_net_unix.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index f25511903115..3d9122e78f41 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
| @@ -144,7 +144,7 @@ static inline void unix_set_secdata(struct scm_cookie *scm, struct sk_buff *skb) | |||
| 144 | /* | 144 | /* |
| 145 | * SMP locking strategy: | 145 | * SMP locking strategy: |
| 146 | * hash table is protected with spinlock unix_table_lock | 146 | * hash table is protected with spinlock unix_table_lock |
| 147 | * each socket state is protected by separate rwlock. | 147 | * each socket state is protected by separate spin lock. |
| 148 | */ | 148 | */ |
| 149 | 149 | ||
| 150 | static inline unsigned unix_hash_fold(__wsum n) | 150 | static inline unsigned unix_hash_fold(__wsum n) |
| @@ -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 | ||
