Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50e37cce authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents a08797e8 a903f086

kernel/cpuset.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -1608,11 +1608,13 @@ static int cpuset_write_u64(struct cgroup *cgrp, struct cftype *cft, u64 val) 
{

{

	struct cpuset *cs = cgroup_cs(cgrp);

	struct cpuset *cs = cgroup_cs(cgrp);

	cpuset_filetype_t type = cft->private;

	cpuset_filetype_t type = cft->private;

	int retval = -ENODEV;

	int retval = 0;





	mutex_lock(&cpuset_mutex);

	mutex_lock(&cpuset_mutex);

	if (!is_cpuset_online(cs))

	if (!is_cpuset_online(cs)) {

		retval = -ENODEV;

		goto out_unlock;

		goto out_unlock;

	}





	switch (type) {

	switch (type) {

	case FILE_CPU_EXCLUSIVE:

	case FILE_CPU_EXCLUSIVE: