aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLi Zefan <lizefan@huawei.com>2013-08-12 22:05:59 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-20 11:43:05 -0400
commit9fa6018620ff121a3d892394021d4285636b7cd5 (patch)
tree31b7a35aa9d76b72aeeb4ed841a9d2986b6e7b5a /kernel
parent94aa327e13898c4c495a27303ce96cc52280fb25 (diff)
cpuset: fix the return value of cpuset_write_u64()
commit a903f0865a190f8778c73df1a810ea6e25e5d7cf upstream. Writing to this file always returns -ENODEV: # echo 1 > cpuset.memory_pressure_enabled -bash: echo: write error: No such device Signed-off-by: Li Zefan <lizefan@huawei.com> Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cpuset.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 64b3f791bbe5..6948e9476b42 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -1502,11 +1502,13 @@ static int cpuset_write_u64(struct cgroup *cgrp, struct cftype *cft, u64 val)
1502{ 1502{
1503 struct cpuset *cs = cgroup_cs(cgrp); 1503 struct cpuset *cs = cgroup_cs(cgrp);
1504 cpuset_filetype_t type = cft->private; 1504 cpuset_filetype_t type = cft->private;
1505 int retval = -ENODEV; 1505 int retval = 0;
1506 1506
1507 mutex_lock(&cpuset_mutex); 1507 mutex_lock(&cpuset_mutex);
1508 if (!is_cpuset_online(cs)) 1508 if (!is_cpuset_online(cs)) {
1509 retval = -ENODEV;
1509 goto out_unlock; 1510 goto out_unlock;
1511 }
1510 1512
1511 switch (type) { 1513 switch (type) {
1512 case FILE_CPU_EXCLUSIVE: 1514 case FILE_CPU_EXCLUSIVE: