lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CGroup API files: move "releasable" to cgroup_debug subsystem

Browse Source 
The "releasable" control file provided by the cgroup framework exports the
state of a per-cgroup flag that's related to the notify-on-release feature.
This isn't really generally useful, unless you're trying to debug this
particular feature of cgroups.

This patch moves the "releasable" file to the cgroup_debug subsystem.

Signed-off-by: Paul Menage <menage@google.com>
Cc: "Li Zefan" <lizf@cn.fujitsu.com>
Cc: Balbir Singh <balbir@in.ibm.com>
Cc: Paul Jackson <pj@sgi.com>
Cc: Pavel Emelyanov <xemul@openvz.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: "YAMAMOTO Takashi" <yamamoto@valinux.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Paul Menage
2008-04-29 01:00:04 -07:00
committed by Linus Torvalds
parent c27e8818a0
commit 3116f0e3df
3 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/linux/cgroup.h
View File

@@ -88,6 +88,17 @@ static inline void css_put(struct cgroup_subsys_state *css)
__css_put(css); __css_put(css);
} }
/* bits in struct cgroup flags field */
enum {
/* Control Group is dead */
CGRP_REMOVED,
/* Control Group has previously had a child cgroup or a task,
* but no longer (only if CGRP_NOTIFY_ON_RELEASE is set) */
CGRP_RELEASABLE,
/* Control Group requires release notifications to userspace */
CGRP_NOTIFY_ON_RELEASE,
};
struct cgroup { struct cgroup {
unsigned long flags; /* "unsigned long" so bitops work */ unsigned long flags; /* "unsigned long" so bitops work */

23
kernel/cgroup.c
View File

@@ -119,17 +119,6 @@ static int root_count;
*/ */
static int need_forkexit_callback; static int need_forkexit_callback;
/* bits in struct cgroup flags field */
enum {
/* Control Group is dead */
CGRP_REMOVED,
/* Control Group has previously had a child cgroup or a task,
* but no longer (only if CGRP_NOTIFY_ON_RELEASE is set) */
CGRP_RELEASABLE,
/* Control Group requires release notifications to userspace */
CGRP_NOTIFY_ON_RELEASE,
};
/* convenient tests for these bits */ /* convenient tests for these bits */
inline int cgroup_is_removed(const struct cgroup *cgrp) inline int cgroup_is_removed(const struct cgroup *cgrp)
{ {
@@ -1307,7 +1296,6 @@ enum cgroup_filetype {
FILE_DIR, FILE_DIR,
FILE_TASKLIST, FILE_TASKLIST,
FILE_NOTIFY_ON_RELEASE, FILE_NOTIFY_ON_RELEASE,
FILE_RELEASABLE,
FILE_RELEASE_AGENT, FILE_RELEASE_AGENT,
}; };
@@ -2186,11 +2174,6 @@ static u64 cgroup_read_notify_on_release(struct cgroup *cgrp,
return notify_on_release(cgrp); return notify_on_release(cgrp);
} }
static u64 cgroup_read_releasable(struct cgroup *cgrp, struct cftype *cft)
{
return test_bit(CGRP_RELEASABLE, &cgrp->flags);
}
/* /*
* for the common functions, 'private' gives the type of file * for the common functions, 'private' gives the type of file
*/ */
@@ -2210,12 +2193,6 @@ static struct cftype files[] = {
.write = cgroup_common_file_write, .write = cgroup_common_file_write,
.private = FILE_NOTIFY_ON_RELEASE, .private = FILE_NOTIFY_ON_RELEASE,
}, },
{
.name = "releasable",
.read_u64 = cgroup_read_releasable,
.private = FILE_RELEASABLE,
}
}; };
static struct cftype cft_release_agent = { static struct cftype cft_release_agent = {

12
kernel/cgroup_debug.c
View File

@@ -1,5 +1,5 @@
/* /*
* kernel/ccontainer_debug.c - Example cgroup subsystem that * kernel/cgroup_debug.c - Example cgroup subsystem that
* exposes debug info * exposes debug info
* *
* Copyright (C) Google Inc, 2007 * Copyright (C) Google Inc, 2007
@@ -62,6 +62,11 @@ static u64 current_css_set_refcount_read(struct cgroup *cont,
return count; return count;
} }
static u64 releasable_read(struct cgroup *cgrp, struct cftype *cft)
{
return test_bit(CGRP_RELEASABLE, &cgrp->flags);
}
static struct cftype files[] = { static struct cftype files[] = {
{ {
.name = "cgroup_refcount", .name = "cgroup_refcount",
@@ -81,6 +86,11 @@ static struct cftype files[] = {
.name = "current_css_set_refcount", .name = "current_css_set_refcount",
.read_u64 = current_css_set_refcount_read, .read_u64 = current_css_set_refcount_read,
}, },
{
.name = "releasable",
.read_u64 = releasable_read,
}
}; };
static int debug_populate(struct cgroup_subsys *ss, struct cgroup *cont) static int debug_populate(struct cgroup_subsys *ss, struct cgroup *cont)