Commit 475f1b52 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by David S. Miller

net: sk_update_clone is only used in net/core/sock.c

so move it there.  Fixes build errors when CONFIG_INET is not defined:

In file included from include/linux/tcp.h:211:0,
                 from include/linux/ipv6.h:221,
                 from include/net/ipv6.h:16,
                 from include/linux/sunrpc/clnt.h:26,
                 from include/linux/nfs_fs.h:50,
                 from init/do_mounts.c:20:
include/net/sock.h: In function 'sk_update_clone':
include/net/sock.h:1109:3: error: implicit declaration of function 'sock_update_memcg' [-Werror=implicit-function-declaration]
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b189e810
...@@ -1103,12 +1103,6 @@ sk_sockets_allocated_read_positive(struct sock *sk) ...@@ -1103,12 +1103,6 @@ sk_sockets_allocated_read_positive(struct sock *sk)
return percpu_counter_sum_positive(prot->sockets_allocated); return percpu_counter_sum_positive(prot->sockets_allocated);
} }
static inline void sk_update_clone(const struct sock *sk, struct sock *newsk)
{
if (mem_cgroup_sockets_enabled && sk->sk_cgrp)
sock_update_memcg(newsk);
}
static inline int static inline int
proto_sockets_allocated_sum_positive(struct proto *prot) proto_sockets_allocated_sum_positive(struct proto *prot)
{ {
......
...@@ -1272,6 +1272,12 @@ void sk_release_kernel(struct sock *sk) ...@@ -1272,6 +1272,12 @@ void sk_release_kernel(struct sock *sk)
} }
EXPORT_SYMBOL(sk_release_kernel); EXPORT_SYMBOL(sk_release_kernel);
static void sk_update_clone(const struct sock *sk, struct sock *newsk)
{
if (mem_cgroup_sockets_enabled && sk->sk_cgrp)
sock_update_memcg(newsk);
}
/** /**
* sk_clone_lock - clone a socket, and lock its clone * sk_clone_lock - clone a socket, and lock its clone
* @sk: the socket to clone * @sk: the socket to clone
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment