diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2016-09-22 15:21:48 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-22 15:21:48 +0200 |
| commit | 7cf0f1426a909ed36a8b349a4a975e0d68b5edad (patch) | |
| tree | 0700bb26ceeefb95efc13c3247c04fe7207b509e /kernel/cgroup.c | |
| parent | locking/rwsem, x86: Drop a bogus cc clobber (diff) | |
| parent | locking/atomic, arch/sh: Fix ATOMIC_FETCH_OP() (diff) | |
| download | linux-dev-7cf0f1426a909ed36a8b349a4a975e0d68b5edad.tar.xz linux-dev-7cf0f1426a909ed36a8b349a4a975e0d68b5edad.zip | |
Merge branch 'locking/urgent' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/cgroup.c')
| -rw-r--r-- | kernel/cgroup.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 9f51cdf58f5a..de1c1bddb4d1 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -6276,6 +6276,12 @@ void cgroup_sk_alloc(struct sock_cgroup_data *skcd) if (cgroup_sk_alloc_disabled) return; + /* Socket clone path */ + if (skcd->val) { + cgroup_get(sock_cgroup_ptr(skcd)); + return; + } + rcu_read_lock(); while (true) { |