cgroup.c: add helper __cset_cgroup_from_root to cleanup duplicated codes
PATCH 1/1 cgroup.c: add helper __cset_cgroup_from_root to cleanup duplicated codes
No funtionality change, but save us some lines.
Signed-off-by Lin Feng <[email protected]>
--- kernel/cgroup/cgroup.c | 58 ++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 31 deletions(-)
kernel/cgroup/cgroup.c +27 -31
@@ -1376,6 +1376,31 @@ static void cgroup_destroy_root(struct cgroup_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 * specified hierarchy
@@ -1391,22 +1416,8 @@ current_cgns_cgroup_from_root(struct cgroup_root *root)rcu_read_lock (); cset = current->nsproxy->cgroup_ns->root_cset; -if (cset == &init_css_set) { - 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; + res =__cset_cgroup_from_root (cset, root); -if (c->root == root) { - res = c; -break ; - } - } - }rcu_read_unlock ();BUG_ON (!res);
@@ -1422,22 +1433,7 @@ static struct cgroup *cset_cgroup_from_root(struct css_set *cset,lockdep_assert_held (&cgroup_mutex);lockdep_assert_held (&css_set_lock); -if (cset == &init_css_set) { - 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 ; - } - } - } + res =__cset_cgroup_from_root (cset, root);BUG_ON (!res);return res;
Signature · 1 line
2.31.1
Hi,
Quoted 81 lines · Lin Feng
No funtionality change, but save us some lines.
Signed-off-by Lin Feng <[email protected]>--- kernel/cgroup/cgroup.c | 58 ++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 31 deletions(-)kernel/cgroup/cgroup.c +26
-25@@ -1376,6 +1376,31 @@ static void cgroup_destroy_root(struct cgroup_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 * specified hierarchy @@ -1391,22 +1416,8 @@ current_cgns_cgroup_from_root(struct cgroup_root *root)rcu_read_lock (); cset = current->nsproxy->cgroup_ns->root_cset; -if (cset == &init_css_set) { - 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; + res =__cset_cgroup_from_root (cset, root); -if (c->root == root) { - res = c; -break ; - } - } - }rcu_read_unlock ();BUG_ON (!res);@@ -1422,22 +1433,7 @@ static struct cgroup *cset_cgroup_from_root(struct css_set *cset,lockdep_assert_held (&cgroup_mutex);lockdep_assert_held (&css_set_lock); -if (cset == &init_css_set) { - 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; -
kernel/cgroup/cgroup.c static struct cgroup *cset_cgroup_from_root(struct css_set *cset, · line 1439
Quoted 10 lines
kernel/cgroup/cgroup.c +1
-6-if (c->root == root) { - res = c; -break ; - } - } - } + res =__cset_cgroup_from_root (cset, root);BUG_ON (!res);return res;
Thanks for the patch
Liked the idea.
Acked-by Mukesh Ojha <[email protected]>
-Mukesh
Quoted 3 lines · Lin Feng
No funtionality change, but save us some lines.
Signed-off-by Lin Feng <[email protected]>
Applied to cgroup/for-5.20.
Thanks.
Signature · 1 line
tejun