The input of css_cls_state() is impossible to NULL except cgrp_css_online, so simplify it
Signed-off-by: Li RongQing <lirongq...@baidu.com> --- net/core/netclassid_cgroup.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/core/netclassid_cgroup.c b/net/core/netclassid_cgroup.c index 5e4f04004a49..ee087cf793c2 100644 --- a/net/core/netclassid_cgroup.c +++ b/net/core/netclassid_cgroup.c @@ -19,7 +19,7 @@ static inline struct cgroup_cls_state *css_cls_state(struct cgroup_subsys_state *css) { - return css ? container_of(css, struct cgroup_cls_state, css) : NULL; + return container_of(css, struct cgroup_cls_state, css); } struct cgroup_cls_state *task_cls_state(struct task_struct *p) @@ -44,10 +44,9 @@ cgrp_css_alloc(struct cgroup_subsys_state *parent_css) static int cgrp_css_online(struct cgroup_subsys_state *css) { struct cgroup_cls_state *cs = css_cls_state(css); - struct cgroup_cls_state *parent = css_cls_state(css->parent); - if (parent) - cs->classid = parent->classid; + if (css->parent) + cs->classid = css_cls_state(css->parent)->classid; return 0; } -- 2.11.0