Merge branch 'master' into for-4.4-fixes

[firefly-linux-kernel-4.4.55.git] / net / core / netclassid_cgroup.c

diff --git a/net/core/netclassid_cgroup.c b/net/core/netclassid_cgroup.c
index 2e4df84c34a194ad61d818f282d1124521b9a828..d9ee8d08a3a6944ebb6e5d8dafe6fb5032aa7a52 100644 (file)
--- a/net/core/netclassid_cgroup.c
+++ b/net/core/netclassid_cgroup.c
@@ -81,9 +81,11 @@ static void update_classid(struct cgroup_subsys_state *css, void *v)
        css_task_iter_end(&it);
 }
 
-static void cgrp_attach(struct cgroup_subsys_state *css,
-                       struct cgroup_taskset *tset)
+static void cgrp_attach(struct cgroup_taskset *tset)
 {
+       struct cgroup_subsys_state *css;
+
+       cgroup_taskset_first(tset, &css);
        update_classid(css,
                       (void *)(unsigned long)css_cls_state(css)->classid);
 }