diff options
| author | Tejun Heo <tj@kernel.org> | 2012-04-01 12:09:55 -0700 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2012-04-01 12:09:55 -0700 |
| commit | 6e6ff25bd548a0c5bf5163e4f63e2793dcefbdcb (patch) | |
| tree | f2c3adbac3286559e88771c714333733e0422760 | |
| parent | 8e3f6541d45e1a002801e56a19530a90f775deba (diff) | |
| download | linux-3.10-6e6ff25bd548a0c5bf5163e4f63e2793dcefbdcb.tar.gz linux-3.10-6e6ff25bd548a0c5bf5163e4f63e2793dcefbdcb.tar.bz2 linux-3.10-6e6ff25bd548a0c5bf5163e4f63e2793dcefbdcb.zip | |
cgroup: merge cft_release_agent cftype array into the base files array
Now that cftype can express whether a file should only be on root,
cft_release_agent can be merged into the base files cftypes array.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Li Zefan <lizf@cn.fujitsu.com>
| -rw-r--r-- | kernel/cgroup.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index df8fb82ef35..66c1e3b5c0f 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -3732,13 +3732,13 @@ static struct cftype files[] = { .read_u64 = cgroup_clone_children_read, .write_u64 = cgroup_clone_children_write, }, -}; - -static struct cftype cft_release_agent = { - .name = "release_agent", - .read_seq_string = cgroup_release_agent_show, - .write_string = cgroup_release_agent_write, - .max_write_len = PATH_MAX, + { + .name = "release_agent", + .flags = CFTYPE_ONLY_ON_ROOT, + .read_seq_string = cgroup_release_agent_show, + .write_string = cgroup_release_agent_write, + .max_write_len = PATH_MAX, + }, }; static int cgroup_populate_dir(struct cgroup *cgrp) @@ -3750,11 +3750,6 @@ static int cgroup_populate_dir(struct cgroup *cgrp) if (err < 0) return err; - if (cgrp == cgrp->top_cgroup) { - if ((err = cgroup_add_file(cgrp, NULL, &cft_release_agent)) < 0) - return err; - } - /* process cftsets of each subsystem */ for_each_subsys(cgrp->root, ss) { struct cftype_set *set; |