diff options
Diffstat (limited to 'include/linux/cgroup.h')
| -rw-r--r-- | include/linux/cgroup.h | 12 | 
1 files changed, 10 insertions, 2 deletions
| diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index ef0b3af0e61c..8c283a910b91 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h @@ -487,13 +487,21 @@ struct cgroup_subsys_state *seq_css(struct seq_file *seq);  static inline int cgroup_name(struct cgroup *cgrp, char *buf, size_t buflen)  { -	return kernfs_name(cgrp->kn, buf, buflen); +	/* dummy_top doesn't have a kn associated */ +	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,  					      size_t buflen)  { -	return kernfs_path(cgrp->kn, buf, 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;  }  static inline void pr_cont_cgroup_name(struct cgroup *cgrp) | 
