diff options
| author | Eric Dumazet <edumazet@google.com> | 2017-10-10 19:12:32 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-10 20:24:29 -0700 |
| commit | 75cb070960ade40fba5de32138390f3c85c90941 (patch) | |
| tree | 0a2ff2fbc1f4ba7381f5ea88b716d732c66e6f63 /net/core/sock.c | |
| parent | befc7a3324b45b7478b29861f2a77f8b2bc17922 (diff) | |
| download | blackbird-obmc-linux-75cb070960ade40fba5de32138390f3c85c90941.tar.gz blackbird-obmc-linux-75cb070960ade40fba5de32138390f3c85c90941.zip | |
Revert "net: defer call to cgroup_sk_alloc()"
This reverts commit fbb1fb4ad415cb31ce944f65a5ca700aaf73a227.
This was not the proper fix, lets cleanly revert it, so that
following patch can be carried to stable versions.
sock_cgroup_ptr() callers do not expect a NULL return value.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/sock.c')
| -rw-r--r-- | net/core/sock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 4499e3153813..70c6ccbdf49f 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1680,7 +1680,6 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority) /* sk->sk_memcg will be populated at accept() time */ newsk->sk_memcg = NULL; - memset(&newsk->sk_cgrp_data, 0, sizeof(newsk->sk_cgrp_data)); atomic_set(&newsk->sk_drops, 0); newsk->sk_send_head = NULL; @@ -1719,6 +1718,8 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority) newsk->sk_incoming_cpu = raw_smp_processor_id(); atomic64_set(&newsk->sk_cookie, 0); + cgroup_sk_alloc(&newsk->sk_cgrp_data); + /* * Before updating sk_refcnt, we must commit prior changes to memory * (Documentation/RCU/rculist_nulls.txt for details) |
