aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/sock.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2015-05-08 22:12:13 -0400
committerDavid S. Miller <davem@davemloft.net>2015-05-11 10:50:18 -0400
commitaffb9792f1d99e1e4d64411e147b648d65f2576e (patch)
tree0f787a635911a4c854638de7ff36cb93a32ca5aa /net/core/sock.c
parent13d3078e22f5651cd0184ce1b4e4ab8a46c62b27 (diff)
net: kill sk_change_net and sk_release_kernel
These functions are no longer needed and no longer used kill them. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/sock.c')
-rw-r--r--net/core/sock.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/net/core/sock.c b/net/core/sock.c
index 9e8968e9ebeb..c18738a795b0 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1466,25 +1466,6 @@ void sk_free(struct sock *sk)
1466} 1466}
1467EXPORT_SYMBOL(sk_free); 1467EXPORT_SYMBOL(sk_free);
1468 1468
1469/*
1470 * Last sock_put should drop reference to sk->sk_net. It has already
1471 * been dropped in sk_change_net. Taking reference to stopping namespace
1472 * is not an option.
1473 * Take reference to a socket to remove it from hash _alive_ and after that
1474 * destroy it in the context of init_net.
1475 */
1476void sk_release_kernel(struct sock *sk)
1477{
1478 if (sk == NULL || sk->sk_socket == NULL)
1479 return;
1480
1481 sock_hold(sk);
1482 sock_net_set(sk, get_net(&init_net));
1483 sock_release(sk->sk_socket);
1484 sock_put(sk);
1485}
1486EXPORT_SYMBOL(sk_release_kernel);
1487
1488static void sk_update_clone(const struct sock *sk, struct sock *newsk) 1469static void sk_update_clone(const struct sock *sk, struct sock *newsk)
1489{ 1470{
1490 if (mem_cgroup_sockets_enabled && sk->sk_cgrp) 1471 if (mem_cgroup_sockets_enabled && sk->sk_cgrp)