cgroup: fix handling of multi-destination migration from subtree_control enabling

[mirror_ubuntu-bionic-kernel.git] / net / core / netclassid_cgroup.c

diff --git a/net/core/netclassid_cgroup.c b/net/core/netclassid_cgroup.c
index 6441f47b1a8ffc78731896fd4ab1b12db43f0992..81cb3c72efe812656975a02daf6707f3e48d1f39 100644 (file)
--- a/net/core/netclassid_cgroup.c
+++ b/net/core/netclassid_cgroup.c
@@ -67,14 +67,15 @@ static int update_classid(const void *v, struct file *file, unsigned n)
        return 0;
 }
 
-static void cgrp_attach(struct cgroup_subsys_state *css,
-                       struct cgroup_taskset *tset)
+static void cgrp_attach(struct cgroup_taskset *tset)
 {
-       struct cgroup_cls_state *cs = css_cls_state(css);
-       void *v = (void *)(unsigned long)cs->classid;
        struct task_struct *p;
+       struct cgroup_subsys_state *css;
+
+       cgroup_taskset_for_each(p, css, tset) {
+               struct cgroup_cls_state *cs = css_cls_state(css);
+               void *v = (void *)(unsigned long)cs->classid;
 
-       cgroup_taskset_for_each(p, tset) {
                task_lock(p);
                iterate_fd(p->files, 0, update_classid, v);
                task_unlock(p);