Skip to content

Commit

Permalink
cgroup: remove NULL checks from [pr_cont_]cgroup_{name|path}()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tejun Heo committed Mar 19, 2014
1 parent 985ed67 commit fdce6bf
Showing 1 changed file with 4 additions and 20 deletions.
24 changes: 4 additions & 20 deletions include/linux/cgroup.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit fdce6bf

Please sign in to comment.