lkml.org 
[lkml]   [2012]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/10] cgroup: merge cft_release_agent cftype array into the base files array
    Date
    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>
    ---
    kernel/cgroup.c | 19 +++++++------------
    1 files changed, 7 insertions(+), 12 deletions(-)

    diff --git a/kernel/cgroup.c b/kernel/cgroup.c
    index 2b1a209..6c396f3 100644
    --- a/kernel/cgroup.c
    +++ b/kernel/cgroup.c
    @@ -3748,13 +3748,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)
    @@ -3766,11 +3766,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;
    --
    1.7.7.3


    \
     
     \ /
      Last update: 2012-03-17 00:39    [W:0.019 / U:61.032 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site