Skip to content

Commit

Permalink
memcg: kill memcg refcnt
Browse files Browse the repository at this point in the history
Now memcg has the same life cycle as its corresponding cgroup.  Kill the
useless refcnt.

Signed-off-by: Li Zefan <[email protected]>
Acked-by: Michal Hocko <[email protected]>
Acked-by: KAMEZAWA Hiroyuki <[email protected]>
Cc: Hugh Dickins <[email protected]>
Cc: Tejun Heo <[email protected]>
Cc: Glauber Costa <[email protected]>
Cc: Johannes Weiner <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
lizf-os authored and torvalds committed Jul 9, 2013
1 parent 8d76a97 commit e0743e6
Showing 1 changed file with 1 addition and 17 deletions.
18 changes: 1 addition & 17 deletions mm/memcontrol.c
Original file line number Diff line number Diff line change
Expand Up @@ -299,8 +299,6 @@ struct mem_cgroup {
bool oom_lock;
atomic_t under_oom;

atomic_t refcnt;

int swappiness;
/* OOM-Killer disable */
int oom_kill_disable;
Expand Down Expand Up @@ -503,8 +501,6 @@ enum res_type {
*/
static DEFINE_MUTEX(memcg_create_mutex);

static void mem_cgroup_put(struct mem_cgroup *memcg);

static inline
struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *s)
{
Expand Down Expand Up @@ -6238,17 +6234,6 @@ static void free_rcu(struct rcu_head *rcu_head)
schedule_work(&memcg->work_freeing);
}

static void __mem_cgroup_put(struct mem_cgroup *memcg, int count)
{
if (atomic_sub_and_test(count, &memcg->refcnt))
call_rcu(&memcg->rcu_freeing, free_rcu);
}

static void mem_cgroup_put(struct mem_cgroup *memcg)
{
__mem_cgroup_put(memcg, 1);
}

/*
* Returns the parent mem_cgroup in memcgroup hierarchy with hierarchy enabled.
*/
Expand Down Expand Up @@ -6308,7 +6293,6 @@ mem_cgroup_css_alloc(struct cgroup *cont)

memcg->last_scanned_node = MAX_NUMNODES;
INIT_LIST_HEAD(&memcg->oom_notify);
atomic_set(&memcg->refcnt, 1);
memcg->move_charge_at_immigrate = 0;
mutex_init(&memcg->thresholds_lock);
spin_lock_init(&memcg->move_lock);
Expand Down Expand Up @@ -6399,7 +6383,7 @@ static void mem_cgroup_css_free(struct cgroup *cont)
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);

memcg_destroy_kmem(memcg);
__mem_cgroup_free(memcg);
call_rcu(&memcg->rcu_freeing, free_rcu);
}

#ifdef CONFIG_MMU
Expand Down

0 comments on commit e0743e6

Please sign in to comment.