mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Lord Glauber Costa of Sealand <glommer@parallels.com>
To: <linux-kernel@vger.kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Tejun Heo <tj@kernel.org>,
	ccross@google.com, Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Paul Turner <pjt@google.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Glauber Costa <glommer@parallels.com>
Subject: [PATCH v6 02/12] cgroup: implement CFTYPE_NO_PREFIX
Date: Thu, 24 Jan 2013 19:17:32 +0400	[thread overview]
Message-ID: <1359040662-8055-3-git-send-email-glommer@parallels.com> (raw)
In-Reply-To: <1359040662-8055-1-git-send-email-glommer@parallels.com>

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@parallels.com>
---
 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 7d73905..7d193f9 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -277,6 +277,7 @@ struct cgroup_map_cb {
 /* cftype->flags */
 #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_NO_PREFIX	(1U << 2)	/* skip subsys prefix */
 
 #define MAX_CFTYPE_NAME		64
 
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 4855892..2f98398 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -2723,7 +2723,8 @@ static int cgroup_add_file(struct cgroup *cgrp, struct cgroup_subsys *subsys,
 
 	simple_xattrs_init(&cft->xattrs);
 
-	if (subsys && !test_bit(ROOT_NOPREFIX, &cgrp->root->flags)) {
+	if (subsys && !(cft->flags & CFTYPE_NO_PREFIX) &&
+	    !test_bit(ROOT_NOPREFIX, &cgrp->root->flags)) {
 		strcpy(name, subsys->name);
 		strcat(name, ".");
 	}
-- 
1.8.1


  parent reply	other threads:[~2013-01-24 15:17 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-24 15:17 [PATCH v6 00/12] per-cgroup cpu-stat Lord Glauber Costa of Sealand
2013-01-24 15:17 ` [PATCH v6 01/12] don't call cpuacct_charge in stop_task.c Lord Glauber Costa of Sealand
2013-01-24 15:17 ` Lord Glauber Costa of Sealand [this message]
2013-01-24 15:17 ` [PATCH v6 03/12] cgroup, sched: let cpu serve the same files as cpuacct Lord Glauber Costa of Sealand
2013-01-24 15:17 ` [PATCH v6 04/12] cgroup, sched: deprecate cpuacct Lord Glauber Costa of Sealand
2013-01-24 15:17 ` [PATCH v6 05/12] sched: adjust exec_clock to use it as cpu usage metric Lord Glauber Costa of Sealand
2013-01-24 15:17 ` [PATCH v6 06/12] cpuacct: don't actually do anything Lord Glauber Costa of Sealand
2013-01-24 15:17 ` [PATCH v6 07/12] sched: document the cpu cgroup Lord Glauber Costa of Sealand
2013-01-24 15:17 ` [PATCH v6 08/12] sched: account guest time per-cgroup as well Lord Glauber Costa of Sealand
2013-01-24 15:17 ` [PATCH v6 09/12] sched: Push put_prev_task() into pick_next_task() Lord Glauber Costa of Sealand
2013-01-24 15:17 ` [PATCH v6 10/12] sched: record per-cgroup number of context switches Lord Glauber Costa of Sealand
2013-01-24 15:17 ` [PATCH v6 11/12] sched: change nr_context_switches calculation Lord Glauber Costa of Sealand
2013-01-24 15:17 ` [PATCH v6 12/12] sched: introduce cgroup file stat_percpu Lord Glauber Costa of Sealand

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1359040662-8055-3-git-send-email-glommer@parallels.com \
    --to=glommer@parallels.com \
    --cc=a.p.zijlstra@chello.nl \
    --cc=akpm@linux-foundation.org \
    --cc=ccross@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=peterz@infradead.org \
    --cc=pjt@google.com \
    --cc=tj@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®