aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2014-02-13 06:58:43 -0500
committerTejun Heo <tj@kernel.org>2014-02-13 06:58:43 -0500
commitbc668c7519ff8b4681af80e92f463bec7bf7cf9e (patch)
treef2940d003d0cb3d2395d5f7d12524e968839add2
parent57fce0a68e3aa71d223d9023aae66c7393970c34 (diff)
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>
-rw-r--r--include/linux/cgroup.h3
-rw-r--r--kernel/cgroup.c30
2 files changed, 0 insertions, 33 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 581a124c7bc8..ef0b3af0e61c 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -528,9 +528,6 @@ bool cgroup_is_descendant(struct cgroup *cgrp, struct cgroup *ancestor);
528struct cgroup_taskset; 528struct cgroup_taskset;
529struct task_struct *cgroup_taskset_first(struct cgroup_taskset *tset); 529struct task_struct *cgroup_taskset_first(struct cgroup_taskset *tset);
530struct task_struct *cgroup_taskset_next(struct cgroup_taskset *tset); 530struct task_struct *cgroup_taskset_next(struct cgroup_taskset *tset);
531struct cgroup_subsys_state *cgroup_taskset_cur_css(struct cgroup_taskset *tset,
532 int subsys_id);
533int cgroup_taskset_size(struct cgroup_taskset *tset);
534 531
535/** 532/**
536 * cgroup_taskset_for_each - iterate cgroup_taskset 533 * cgroup_taskset_for_each - iterate cgroup_taskset
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 704c590a81d7..a9d9bbb12310 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1647,7 +1647,6 @@ struct cgroup_taskset {
1647 struct flex_array *tc_array; 1647 struct flex_array *tc_array;
1648 int tc_array_len; 1648 int tc_array_len;
1649 int idx; 1649 int idx;
1650 struct cgroup *cur_cgrp;
1651}; 1650};
1652 1651
1653/** 1652/**
@@ -1662,7 +1661,6 @@ struct task_struct *cgroup_taskset_first(struct cgroup_taskset *tset)
1662 tset->idx = 0; 1661 tset->idx = 0;
1663 return cgroup_taskset_next(tset); 1662 return cgroup_taskset_next(tset);
1664 } else { 1663 } else {
1665 tset->cur_cgrp = tset->single.cgrp;
1666 return tset->single.task; 1664 return tset->single.task;
1667 } 1665 }
1668} 1666}
@@ -1683,39 +1681,11 @@ struct task_struct *cgroup_taskset_next(struct cgroup_taskset *tset)
1683 return NULL; 1681 return NULL;
1684 1682
1685 tc = flex_array_get(tset->tc_array, tset->idx++); 1683 tc = flex_array_get(tset->tc_array, tset->idx++);
1686 tset->cur_cgrp = tc->cgrp;
1687 return tc->task; 1684 return tc->task;
1688} 1685}
1689EXPORT_SYMBOL_GPL(cgroup_taskset_next); 1686EXPORT_SYMBOL_GPL(cgroup_taskset_next);
1690 1687
1691/** 1688/**
1692 * cgroup_taskset_cur_css - return the matching css for the current task
1693 * @tset: taskset of interest
1694 * @subsys_id: the ID of the target subsystem
1695 *
1696 * Return the css for the current (last returned) task of @tset for
1697 * subsystem specified by @subsys_id. This function must be preceded by
1698 * either cgroup_taskset_first() or cgroup_taskset_next().
1699 */
1700struct cgroup_subsys_state *cgroup_taskset_cur_css(struct cgroup_taskset *tset,
1701 int subsys_id)
1702{
1703 return cgroup_css(tset->cur_cgrp, cgroup_subsys[subsys_id]);
1704}
1705EXPORT_SYMBOL_GPL(cgroup_taskset_cur_css);
1706
1707/**
1708 * cgroup_taskset_size - return the number of tasks in taskset
1709 * @tset: taskset of interest
1710 */
1711int cgroup_taskset_size(struct cgroup_taskset *tset)
1712{
1713 return tset->tc_array ? tset->tc_array_len : 1;
1714}
1715EXPORT_SYMBOL_GPL(cgroup_taskset_size);
1716
1717
1718/**
1719 * cgroup_task_migrate - move a task from one cgroup to another. 1689 * cgroup_task_migrate - move a task from one cgroup to another.
1720 * @old_cgrp; the cgroup @tsk is being migrated from 1690 * @old_cgrp; the cgroup @tsk is being migrated from
1721 * @tsk: the task being migrated 1691 * @tsk: the task being migrated