cgroup: remove cgroup_taskset_cur_css() and cgroup_taskset_size()

The two functions don't have any users left.  Remove them along with
cgroup_taskset->cur_cgrp.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Li Zefan <lizefan@huawei.com>

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 581a124c7bc89d1fda7eaa707c42fe4ae80c8b75..ef0b3af0e61c04ece7244fa2161bf8859c487c03 100644 (file)
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -528,9 +528,6 @@ bool cgroup_is_descendant(struct cgroup *cgrp, struct cgroup *ancestor);
 struct cgroup_taskset;
 struct task_struct *cgroup_taskset_first(struct cgroup_taskset *tset);
 struct task_struct *cgroup_taskset_next(struct cgroup_taskset *tset);
-struct cgroup_subsys_state *cgroup_taskset_cur_css(struct cgroup_taskset *tset,
-                                                  int subsys_id);
-int cgroup_taskset_size(struct cgroup_taskset *tset);
 
 /**
  * cgroup_taskset_for_each - iterate cgroup_taskset

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 704c590a81d767af579c27758fb378cae18eaf46..a9d9bbb12310159b28bf95a237e692de951d3df8 100644 (file)
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1647,7 +1647,6 @@ struct cgroup_taskset {
        struct flex_array       *tc_array;
        int                     tc_array_len;
        int                     idx;
-       struct cgroup           *cur_cgrp;
 };
 
 /**
@@ -1662,7 +1661,6 @@ struct task_struct *cgroup_taskset_first(struct cgroup_taskset *tset)
                tset->idx = 0;
                return cgroup_taskset_next(tset);
        } else {
-               tset->cur_cgrp = tset->single.cgrp;
                return tset->single.task;
        }
 }
@@ -1683,38 +1681,10 @@ struct task_struct *cgroup_taskset_next(struct cgroup_taskset *tset)
                return NULL;
 
        tc = flex_array_get(tset->tc_array, tset->idx++);
-       tset->cur_cgrp = tc->cgrp;
        return tc->task;
 }
 EXPORT_SYMBOL_GPL(cgroup_taskset_next);
 
-/**
- * cgroup_taskset_cur_css - return the matching css for the current task
- * @tset: taskset of interest
- * @subsys_id: the ID of the target subsystem
- *
- * Return the css for the current (last returned) task of @tset for
- * subsystem specified by @subsys_id.  This function must be preceded by
- * either cgroup_taskset_first() or cgroup_taskset_next().
- */
-struct cgroup_subsys_state *cgroup_taskset_cur_css(struct cgroup_taskset *tset,
-                                                  int subsys_id)
-{
-       return cgroup_css(tset->cur_cgrp, cgroup_subsys[subsys_id]);
-}
-EXPORT_SYMBOL_GPL(cgroup_taskset_cur_css);
-
-/**
- * cgroup_taskset_size - return the number of tasks in taskset
- * @tset: taskset of interest
- */
-int cgroup_taskset_size(struct cgroup_taskset *tset)
-{
-       return tset->tc_array ? tset->tc_array_len : 1;
-}
-EXPORT_SYMBOL_GPL(cgroup_taskset_size);
-
-
 /**
  * cgroup_task_migrate - move a task from one cgroup to another.
  * @old_cgrp; the cgroup @tsk is being migrated from