Messages in this thread Patch in this message | | | From | Glauber Costa <> | Subject | [PATCH v7 02/11] cgroup: implement CFTYPE_NO_PREFIX | Date | Wed, 29 May 2013 15:03:13 +0400 |
| |
From: Tejun Heo <tj@kernel.org>
When cgroup files are created, cgroup core automatically prepends the name of the subsystem as prefix. This patch adds CFTYPE_NO_PREFIX which disables the automatic prefix.
This will be used to deprecate cpuacct which will make cpu create and serve the cpuacct files.
Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Glauber Costa <glommer@openvz.org> --- include/linux/cgroup.h | 1 + kernel/cgroup.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 5047355..5a8a093 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h @@ -397,6 +397,7 @@ struct cgroup_map_cb { #define CFTYPE_ONLY_ON_ROOT (1U << 0) /* only create on root cg */ #define CFTYPE_NOT_ON_ROOT (1U << 1) /* don't create on root cg */ #define CFTYPE_INSANE (1U << 2) /* don't create if sane_behavior */ +#define CFTYPE_NO_PREFIX (1U << 3) /* skip subsys prefix */ #define MAX_CFTYPE_NAME 64 diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 2a99262..8bbeb4d 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -2681,7 +2681,8 @@ static int cgroup_add_file(struct cgroup *cgrp, struct cgroup_subsys *subsys, umode_t mode; char name[MAX_CGROUP_TYPE_NAMELEN + MAX_CFTYPE_NAME + 2] = { 0 }; - if (subsys && !(cgrp->root->flags & CGRP_ROOT_NOPREFIX)) { + if (subsys && !(cft->flags & CFTYPE_NO_PREFIX) && + !(cgrp->root->flags & CGRP_ROOT_NOPREFIX)) { strcpy(name, subsys->name); strcat(name, "."); } -- 1.8.1.4
| |