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.
Showing the changes to kernel (1 of 1 file). Show all
Unified · Split
| @@ -3732,13 +3732,13 @@ static struct cftype files[] = { · 3731 unmodified lines | ||
| 3732 | 3732 | .read_u64 = cgroup_clone_children_read, |
| 3733 | 3733 | .write_u64 = cgroup_clone_children_write, |
| 3734 | 3734 | }, |
| 3735 | −}; | |
| 3736 | − | |
| 3737 | −static struct cftype cft_release_agent = { | |
| 3738 | − .name = "release_agent", | |
| 3739 | − .read_seq_string = cgroup_release_agent_show, | |
| 3740 | − .write_string = cgroup_release_agent_write, | |
| 3741 | − .max_write_len = PATH_MAX, | |
| 3735 | + { | |
| 3736 | + .name = "release_agent", | |
| 3737 | + .flags = CFTYPE_ONLY_ON_ROOT, | |
| 3738 | + .read_seq_string = cgroup_release_agent_show, | |
| 3739 | + .write_string = cgroup_release_agent_write, | |
| 3740 | + .max_write_len = PATH_MAX, | |
| 3741 | + }, | |
| 3742 | 3742 | }; |
| 3743 | 3743 | |
| 3744 | 3744 | static int cgroup_populate_dir(struct cgroup *cgrp) |
| @@ -3750,11 +3750,6 @@ static int cgroup_populate_dir(struct cgroup *cgrp) · 5 unmodified lines | ||
| 3750 | 3750 | if (err < 0) |
| 3751 | 3751 | return err; |
| 3752 | 3752 | |
| 3753 | − if (cgrp == cgrp->top_cgroup) { | |
| 3754 | − if ((err = cgroup_add_file(cgrp, NULL, &cft_release_agent)) < 0) | |
| 3755 | − return err; | |
| 3756 | − } | |
| 3757 | − | |
| 3758 | 3753 | /* process cftsets of each subsystem */ |
| 3759 | 3754 | for_each_subsys(cgrp->root, ss) { |
| 3760 | 3755 | struct cftype_set *set; |