summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-01-19 11:25:17 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-01-19 11:25:17 -0800
commit8b335c7d22df5a5c252e4c22559a3f3ae011e3f0 (patch)
treef26352a796defb3b944372374009d6c4ae5a1c15 /kernel
parenta2c9c1c0352bb16564680dbd1af21bfe56b7f000 (diff)
parent4f58424da3deead2605e39a9df65f5f06107a3cb (diff)
Merge branch 'for-4.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fix from Tejun Heo: "cgroup.threads should be delegatable (ie. a container should be able to write to it from inside) but was missing the flag. The change is very low risk" * 'for-4.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: cgroup: make cgroup.threads delegatable
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cgroup/cgroup.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 2cf06c274e4c..7e4c44538119 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -4447,6 +4447,7 @@ static struct cftype cgroup_base_files[] = {
},
{
.name = "cgroup.threads",
+ .flags = CFTYPE_NS_DELEGATABLE,
.release = cgroup_procs_release,
.seq_start = cgroup_threads_start,
.seq_next = cgroup_procs_next,