summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-08-18 08:51:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-08-18 08:51:28 -0700
commit50e37ccea06ca8846ceb60dbfbe056012c60d71b (patch)
treeb64788e97e2bfbaaf8c274ca4cd9da95314f275a /kernel
parenta08797e853e27fedb2468d4fd45459fd62902143 (diff)
parenta903f0865a190f8778c73df1a810ea6e25e5d7cf (diff)
downloadop-kernel-dev-50e37ccea06ca8846ceb60dbfbe056012c60d71b.zip
op-kernel-dev-50e37ccea06ca8846ceb60dbfbe056012c60d71b.tar.gz
Merge branch 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fix from Tejun Heo: "This contains one patch to fix the return value of cpuset's cgroups interface function, which used to always return -ENODEV for the writes on the 'memory_pressure_enabled' file" * 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: cpuset: fix the return value of cpuset_write_u64()
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 e565778..010a008 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -1608,11 +1608,13 @@ static int cpuset_write_u64(struct cgroup *cgrp, struct cftype *cft, u64 val)
{
struct cpuset *cs = cgroup_cs(cgrp);
cpuset_filetype_t type = cft->private;
- int retval = -ENODEV;
+ int retval = 0;
mutex_lock(&cpuset_mutex);
- if (!is_cpuset_online(cs))
+ if (!is_cpuset_online(cs)) {
+ retval = -ENODEV;
goto out_unlock;
+ }
switch (type) {
case FILE_CPU_EXCLUSIVE:
OpenPOWER on IntegriCloud