提交 fdce6bf8 编写于 作者: T Tejun Heo

cgroup: remove NULL checks from [pr_cont_]cgroup_{name|path}()

The dummy hierarchy is now a fully functional one and dummy_top has a
kernfs_node associated with it.  Drop the NULL checks in
[pr_cont_]cont_{name|path}() which are no longer necessary.
Signed-off-by: NTejun Heo <tj@kernel.org>
Acked-by: NLi Zefan <lizefan@huawei.com>
上级 985ed670
......@@ -508,39 +508,23 @@ struct cgroup_subsys_state *seq_css(struct seq_file *seq);
static inline int cgroup_name(struct cgroup *cgrp, char *buf, size_t buflen)
{
/* dummy_top doesn't have a kn associated */
if (cgrp->kn)
return kernfs_name(cgrp->kn, buf, buflen);
else
return strlcpy(buf, "/", buflen);
return kernfs_name(cgrp->kn, buf, buflen);
}
static inline char * __must_check cgroup_path(struct cgroup *cgrp, char *buf,
size_t buflen)
{
/* dummy_top doesn't have a kn associated */
if (cgrp->kn)
return kernfs_path(cgrp->kn, buf, buflen);
strlcpy(buf, "/", buflen);
return (buflen <= 2) ? NULL : buf;
return kernfs_path(cgrp->kn, buf, buflen);
}
static inline void pr_cont_cgroup_name(struct cgroup *cgrp)
{
/* dummy_top doesn't have a kn associated */
if (cgrp->kn)
pr_cont_kernfs_name(cgrp->kn);
else
pr_cont("/");
pr_cont_kernfs_name(cgrp->kn);
}
static inline void pr_cont_cgroup_path(struct cgroup *cgrp)
{
/* dummy_top doesn't have a kn associated */
if (cgrp->kn)
pr_cont_kernfs_path(cgrp->kn);
else
pr_cont("/");
pr_cont_kernfs_path(cgrp->kn);
}
char *task_cgroup_path(struct task_struct *task, char *buf, size_t buflen);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册