diff options
| author | Glauber Costa <glommer@parallels.com> | 2012-01-05 20:16:39 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-07 10:16:34 -0800 |
| commit | f3f511e1ce6f1a6f0a5bb8320e9f802e76f6b999 (patch) | |
| tree | bedb8b38bec1bdb3fa7159bc61822488984d3ce0 /include/net | |
| parent | 356b95424cfb456e14a59eaa579422ce014c424b (diff) | |
| download | blackbird-op-linux-f3f511e1ce6f1a6f0a5bb8320e9f802e76f6b999.tar.gz blackbird-op-linux-f3f511e1ce6f1a6f0a5bb8320e9f802e76f6b999.zip | |
net: fix sock_clone reference mismatch with tcp memcontrol
Sockets can also be created through sock_clone. Because it copies
all data in the sock structure, it also copies the memcg-related pointer,
and all should be fine. However, since we now use reference counts in
socket creation, we are left with some sockets that have no reference
counts. It matters when we destroy them, since it leads to a mismatch.
Signed-off-by: Glauber Costa <glommer@parallels.com>
CC: David S. Miller <davem@davemloft.net>
CC: Greg Thelen <gthelen@google.com>
CC: Hiroyouki Kamezawa <kamezawa.hiroyu@jp.fujitsu.com>
CC: Laurent Chavey <chavey@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/sock.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index bb972d254dff..0ed65e3a0bea 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1103,6 +1103,12 @@ sk_sockets_allocated_read_positive(struct sock *sk) 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 proto_sockets_allocated_sum_positive(struct proto *prot) { |
