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: Tejun Heo <tj@kernel.org>
Acked-by: Li Zefan <lizefan@huawei.com>
This commit is contained in:
Tejun Heo 2014-03-19 10:23:54 -04:00
parent 985ed67014
commit fdce6bf8c5

View File

@ -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) static inline int cgroup_name(struct cgroup *cgrp, char *buf, size_t buflen)
{ {
/* dummy_top doesn't have a kn associated */ return kernfs_name(cgrp->kn, buf, buflen);
if (cgrp->kn)
return kernfs_name(cgrp->kn, buf, buflen);
else
return strlcpy(buf, "/", buflen);
} }
static inline char * __must_check cgroup_path(struct cgroup *cgrp, char *buf, static inline char * __must_check cgroup_path(struct cgroup *cgrp, char *buf,
size_t buflen) size_t buflen)
{ {
/* dummy_top doesn't have a kn associated */ return kernfs_path(cgrp->kn, buf, buflen);
if (cgrp->kn)
return kernfs_path(cgrp->kn, buf, buflen);
strlcpy(buf, "/", buflen);
return (buflen <= 2) ? NULL : buf;
} }
static inline void pr_cont_cgroup_name(struct cgroup *cgrp) static inline void pr_cont_cgroup_name(struct cgroup *cgrp)
{ {
/* dummy_top doesn't have a kn associated */ pr_cont_kernfs_name(cgrp->kn);
if (cgrp->kn)
pr_cont_kernfs_name(cgrp->kn);
else
pr_cont("/");
} }
static inline void pr_cont_cgroup_path(struct cgroup *cgrp) static inline void pr_cont_cgroup_path(struct cgroup *cgrp)
{ {
/* dummy_top doesn't have a kn associated */ pr_cont_kernfs_path(cgrp->kn);
if (cgrp->kn)
pr_cont_kernfs_path(cgrp->kn);
else
pr_cont("/");
} }
char *task_cgroup_path(struct task_struct *task, char *buf, size_t buflen); char *task_cgroup_path(struct task_struct *task, char *buf, size_t buflen);