Skip to content

Commit

Permalink
cgroup: rename cgroup_dummy_root and related names
Browse files Browse the repository at this point in the history
The dummy root will be repurposed to serve as the default unified
hierarchy.  Let's rename things in preparation.

* s/cgroup_dummy_root/cgrp_dfl_root/
* s/cgroupfs_root/cgroup_root/ as we don't do fs part directly anymore
* s/cgroup_root->top_cgroup/cgroup_root->cgrp/ for brevity

This is pure rename.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Li Zefan <lizefan@huawei.com>
  • Loading branch information
Tejun Heo committed Mar 19, 2014
1 parent 9441962 commit 3dd06ff
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 94 deletions.
14 changes: 7 additions & 7 deletions include/linux/cgroup.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#ifdef CONFIG_CGROUPS

struct cgroupfs_root;
struct cgroup_root;
struct cgroup_subsys;
struct inode;
struct cgroup;
Expand Down Expand Up @@ -179,7 +179,7 @@ struct cgroup {
/* Private pointers for each registered subsystem */
struct cgroup_subsys_state __rcu *subsys[CGROUP_SUBSYS_COUNT];

struct cgroupfs_root *root;
struct cgroup_root *root;

/*
* List of cgrp_cset_links pointing at css_sets with tasks in this
Expand Down Expand Up @@ -211,7 +211,7 @@ struct cgroup {

#define MAX_CGROUP_ROOT_NAMELEN 64

/* cgroupfs_root->flags */
/* cgroup_root->flags */
enum {
/*
* Unfortunately, cgroup core and various controllers are riddled
Expand Down Expand Up @@ -272,18 +272,18 @@ enum {
};

/*
* A cgroupfs_root represents the root of a cgroup hierarchy, and may be
* A cgroup_root represents the root of a cgroup hierarchy, and may be
* associated with a kernfs_root to form an active hierarchy. This is
* internal to cgroup core. Don't access directly from controllers.
*/
struct cgroupfs_root {
struct cgroup_root {
struct kernfs_root *kf_root;

/* Unique id for this hierarchy. */
int hierarchy_id;

/* The root cgroup. Root is destroyed on its release. */
struct cgroup top_cgroup;
struct cgroup cgrp;

/* Number of cgroups in the hierarchy, used only for /proc/cgroups */
atomic_t nr_cgrps;
Expand Down Expand Up @@ -598,7 +598,7 @@ struct cgroup_subsys {
const char *name;

/* link to parent, protected by cgroup_lock() */
struct cgroupfs_root *root;
struct cgroup_root *root;

/*
* List of cftypes. Each entry is the first entry of an array
Expand Down
Loading

0 comments on commit 3dd06ff

Please sign in to comment.