lkml.org 
[lkml]   [2012]   [Jun]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2] memcg: unify mem_control_xxx to memcg_xxx
    Date
    From: Wanpeng Li <liwp@linux.vnet.ibm.com>

    Changelog:

    V2 -> V1:

    * replace memory_cgroup_xxx by memcg_xxx

    Unify memcg functions to memcg_xxx.

    Signed-off-by: Wanpeng Li <liwp.linux@gmail.com>
    Acked-by: Johannes Weiner <hannes@cmpxchg.org>
    Acked-by: Michal Hocko <mhocko@suse.cz>
    Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    ---
    mm/memcontrol.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/mm/memcontrol.c b/mm/memcontrol.c
    index ccda728..2e81328 100644
    --- a/mm/memcontrol.c
    +++ b/mm/memcontrol.c
    @@ -3999,7 +3999,7 @@ static int mem_cgroup_move_charge_write(struct cgroup *cgrp,
    #endif

    #ifdef CONFIG_NUMA
    -static int mem_control_numa_stat_show(struct cgroup *cont, struct cftype *cft,
    +static int memcg_numa_stat_show(struct cgroup *cont, struct cftype *cft,
    struct seq_file *m)
    {
    int nid;
    @@ -4058,7 +4058,7 @@ static inline void mem_cgroup_lru_names_not_uptodate(void)
    BUILD_BUG_ON(ARRAY_SIZE(mem_cgroup_lru_names) != NR_LRU_LISTS);
    }

    -static int mem_control_stat_show(struct cgroup *cont, struct cftype *cft,
    +static int memcg_stat_show(struct cgroup *cont, struct cftype *cft,
    struct seq_file *m)
    {
    struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
    @@ -4572,7 +4572,7 @@ static struct cftype mem_cgroup_files[] = {
    },
    {
    .name = "stat",
    - .read_seq_string = mem_control_stat_show,
    + .read_seq_string = memcg_stat_show,
    },
    {
    .name = "force_empty",
    @@ -4604,7 +4604,7 @@ static struct cftype mem_cgroup_files[] = {
    #ifdef CONFIG_NUMA
    {
    .name = "numa_stat",
    - .read_seq_string = mem_control_numa_stat_show,
    + .read_seq_string = memcg_numa_stat_show,
    },
    #endif
    #ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2012-06-27 02:41    [W:0.024 / U:63.540 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site