Skip to content

Commit 50e37cc

Browse files
committed
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()
2 parents a08797e + a903f08 commit 50e37cc

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

kernel/cpuset.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1608,11 +1608,13 @@ static int cpuset_write_u64(struct cgroup *cgrp, struct cftype *cft, u64 val)
16081608
{
16091609
struct cpuset *cs = cgroup_cs(cgrp);
16101610
cpuset_filetype_t type = cft->private;
1611-
int retval = -ENODEV;
1611+
int retval = 0;
16121612

16131613
mutex_lock(&cpuset_mutex);
1614-
if (!is_cpuset_online(cs))
1614+
if (!is_cpuset_online(cs)) {
1615+
retval = -ENODEV;
16151616
goto out_unlock;
1617+
}
16161618

16171619
switch (type) {
16181620
case FILE_CPU_EXCLUSIVE:

0 commit comments

Comments
 (0)