提交 e210a89f 编写于 作者: L Lin Feng 提交者: Tejun Heo

cgroup.c: add helper __cset_cgroup_from_root to cleanup duplicated codes

No funtionality change, but save us some lines.
Signed-off-by: NLin Feng <linf@wangsu.com>
Acked-by: NMukesh Ojha <quic_mojha@quicinc.com>
Signed-off-by: NTejun Heo <tj@kernel.org>
上级 5f69a657
...@@ -1376,6 +1376,31 @@ static void cgroup_destroy_root(struct cgroup_root *root) ...@@ -1376,6 +1376,31 @@ static void cgroup_destroy_root(struct cgroup_root *root)
cgroup_free_root(root); cgroup_free_root(root);
} }
static inline struct cgroup *__cset_cgroup_from_root(struct css_set *cset,
struct cgroup_root *root)
{
struct cgroup *res_cgroup = NULL;
if (cset == &init_css_set) {
res_cgroup = &root->cgrp;
} else if (root == &cgrp_dfl_root) {
res_cgroup = cset->dfl_cgrp;
} else {
struct cgrp_cset_link *link;
list_for_each_entry(link, &cset->cgrp_links, cgrp_link) {
struct cgroup *c = link->cgrp;
if (c->root == root) {
res_cgroup = c;
break;
}
}
}
return res_cgroup;
}
/* /*
* look up cgroup associated with current task's cgroup namespace on the * look up cgroup associated with current task's cgroup namespace on the
* specified hierarchy * specified hierarchy
...@@ -1391,22 +1416,8 @@ current_cgns_cgroup_from_root(struct cgroup_root *root) ...@@ -1391,22 +1416,8 @@ current_cgns_cgroup_from_root(struct cgroup_root *root)
rcu_read_lock(); rcu_read_lock();
cset = current->nsproxy->cgroup_ns->root_cset; cset = current->nsproxy->cgroup_ns->root_cset;
if (cset == &init_css_set) { res = __cset_cgroup_from_root(cset, root);
res = &root->cgrp;
} else if (root == &cgrp_dfl_root) {
res = cset->dfl_cgrp;
} else {
struct cgrp_cset_link *link;
list_for_each_entry(link, &cset->cgrp_links, cgrp_link) {
struct cgroup *c = link->cgrp;
if (c->root == root) {
res = c;
break;
}
}
}
rcu_read_unlock(); rcu_read_unlock();
BUG_ON(!res); BUG_ON(!res);
...@@ -1422,22 +1433,7 @@ static struct cgroup *cset_cgroup_from_root(struct css_set *cset, ...@@ -1422,22 +1433,7 @@ static struct cgroup *cset_cgroup_from_root(struct css_set *cset,
lockdep_assert_held(&cgroup_mutex); lockdep_assert_held(&cgroup_mutex);
lockdep_assert_held(&css_set_lock); lockdep_assert_held(&css_set_lock);
if (cset == &init_css_set) { res = __cset_cgroup_from_root(cset, root);
res = &root->cgrp;
} else if (root == &cgrp_dfl_root) {
res = cset->dfl_cgrp;
} else {
struct cgrp_cset_link *link;
list_for_each_entry(link, &cset->cgrp_links, cgrp_link) {
struct cgroup *c = link->cgrp;
if (c->root == root) {
res = c;
break;
}
}
}
BUG_ON(!res); BUG_ON(!res);
return res; return res;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册