Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[~andy/linux] / kernel / cpuset.c

diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 95f4b25e153863cad13aa0f443d46897c4da27e3..6bf981e13c437ff81979f4c9f08f69998c8ca45a 100644 (file)
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -464,13 +464,17 @@ static int validate_change(struct cpuset *cur, struct cpuset *trial)
 
        /*
         * Cpusets with tasks - existing or newly being attached - can't
-        * have empty cpus_allowed or mems_allowed.
+        * be changed to have empty cpus_allowed or mems_allowed.
         */
        ret = -ENOSPC;
-       if ((cgroup_task_count(cur->css.cgroup) || cur->attach_in_progress) &&
-           (cpumask_empty(trial->cpus_allowed) &&
-            nodes_empty(trial->mems_allowed)))
-               goto out;
+       if ((cgroup_task_count(cur->css.cgroup) || cur->attach_in_progress)) {
+               if (!cpumask_empty(cur->cpus_allowed) &&
+                   cpumask_empty(trial->cpus_allowed))
+                       goto out;
+               if (!nodes_empty(cur->mems_allowed) &&
+                   nodes_empty(trial->mems_allowed))
+                       goto out;
+       }
 
        ret = 0;
 out:
@@ -1596,11 +1600,13 @@ static int cpuset_write_u64(struct cgroup_subsys_state *css, struct cftype *cft,
 {
        struct cpuset *cs = css_cs(css);
        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: