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

[Tejun Heo]

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 <t...@kernel.org>
---
 include/linux/cgroup.h | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index acbb9a4..9f4f253 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -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);
-- 
1.8.5.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/