summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaiman Long <longman@redhat.com>2017-08-24 12:04:29 -0400
committerTejun Heo <tj@kernel.org>2017-08-24 09:42:28 -0700
commit1c08c22c874ac88799cab1f78c40f46110274915 (patch)
tree47063173ff468e26f39a3e8ebe14fc0adcca3994
parent3c74541777302eec43a0d1327c4d58b8659a776b (diff)
downloadlinux-1c08c22c874ac88799cab1f78c40f46110274915.tar.gz
linux-1c08c22c874ac88799cab1f78c40f46110274915.tar.bz2
linux-1c08c22c874ac88799cab1f78c40f46110274915.zip
cpuset: Fix incorrect memory_pressure control file mapping
The memory_pressure control file was incorrectly set up without a private value (0, by default). As a result, this control file was treated like memory_migrate on read. By adding back the FILE_MEMORY_PRESSURE private value, the correct memory pressure value will be returned. Signed-off-by: Waiman Long <longman@redhat.com> Signed-off-by: Tejun Heo <tj@kernel.org> Fixes: 7dbdb199d3bf ("cgroup: replace cftype->mode with CFTYPE_WORLD_WRITABLE") Cc: stable@vger.kernel.org # v4.4+
-rw-r--r--kernel/cgroup/cpuset.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index ca8376e5008c..8362bac0d179 100644
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -1891,6 +1891,7 @@ static struct cftype files[] = {
{
.name = "memory_pressure",
.read_u64 = cpuset_read_u64,
+ .private = FILE_MEMORY_PRESSURE,
},
{