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

[linux-2.6-microblaze.git] / kernel / cgroup / cpuset.c

diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index b897314..479743d 100644 (file)
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -2109,10 +2109,8 @@ out_unlock:
 static void cpuset_cancel_attach(struct cgroup_taskset *tset)
 {
        struct cgroup_subsys_state *css;
-       struct cpuset *cs;
 
        cgroup_taskset_first(tset, &css);
-       cs = css_cs(css);
 
        mutex_lock(&cpuset_mutex);
        css_cs(css)->attach_in_progress--;
@@ -2468,11 +2466,11 @@ static ssize_t sched_partition_write(struct kernfs_open_file *of, char *buf,
        buf = strstrip(buf);
 
        /*
-        * Convert "root"/"1" to 1, and convert "member"/"0" to 0.
+        * Convert "root" to ENABLED, and convert "member" to DISABLED.
         */
-       if (!strcmp(buf, "root") || !strcmp(buf, "1"))
+       if (!strcmp(buf, "root"))
                val = PRS_ENABLED;
-       else if (!strcmp(buf, "member") || !strcmp(buf, "0"))
+       else if (!strcmp(buf, "member"))
                val = PRS_DISABLED;
        else
                return -EINVAL;
@@ -2631,7 +2629,7 @@ static struct cftype dfl_files[] = {
        },
 
        {
-               .name = "sched.partition",
+               .name = "cpus.partition",
                .seq_show = sched_partition_show,
                .write = sched_partition_write,
                .private = FILE_PARTITION_ROOT,
@@ -3476,9 +3474,9 @@ void cpuset_print_current_mems_allowed(void)
        rcu_read_lock();
 
        cgrp = task_cs(current)->css.cgroup;
-       pr_info("%s cpuset=", current->comm);
+       pr_cont(",cpuset=");
        pr_cont_cgroup_name(cgrp);
-       pr_cont(" mems_allowed=%*pbl\n",
+       pr_cont(",mems_allowed=%*pbl",
                nodemask_pr_args(&current->mems_allowed));
 
        rcu_read_unlock();