Skip to contentSkip to conversation

memcg: remove pcp_counter_lock

PATCH In review Greg Thelen 3 participants 3 messages Sep 23, 2015 – Sep 24, 2015

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 memcg: remove pcp_counter_lock

Commit 733a572e66d2 ("memcg: make mem_cgroup_read_{stat|event}() iterate possible cpus instead of online") removed the last use of the per memcg pcp_counter_lock but forgot to remove the variable.

Kill the vestigial variable.

---
 include/linux/memcontrol.h | 1 -
 mm/memcontrol.c            | 1 -
 2 files changed, 2 deletions(-)
include/linux/memcontrol.h +0 -1
index ad800e62cb7a..6452ff4c463f 100644
@@ -242,7 +242,6 @@ struct mem_cgroup {
 	 * percpu counter.
 	 */
 	struct mem_cgroup_stat_cpu __percpu *stat;
-	spinlock_t pcp_counter_lock;
 
 #if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_INET)
 	struct cg_proto tcp_mem;
mm/memcontrol.c +0 -1
index 6ddaeba34e09..da21143550c0 100644
@@ -4179,7 +4179,6 @@ static struct mem_cgroup *mem_cgroup_alloc(void)
 	if (memcg_wb_domain_init(memcg, GFP_KERNEL))
 		goto out_free_stat;
 
-	spin_lock_init(&memcg->pcp_counter_lock);
 	return memcg;
 
 out_free_stat:
Signature · 7 lines
2.6.0.rc0.131.gf624c3d

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to [email protected].  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · Greg Thelen

Commit 733a572e66d2 ("memcg: make mem_cgroup_read_{stat|event}() iterate possible cpus instead of online") removed the last use of the per memcg pcp_counter_lock but forgot to remove the variable.

Kill the vestigial variable.

Quoted 31 lines
---
 include/linux/memcontrol.h | 1 -
 mm/memcontrol.c            | 1 -
 2 files changed, 2 deletions(-)
include/linux/memcontrol.h +0 -1
index ad800e62cb7a..6452ff4c463f 100644
@@ -242,7 +242,6 @@ struct mem_cgroup {
 	 * percpu counter.
 	 */
 	struct mem_cgroup_stat_cpu __percpu *stat;
-	spinlock_t pcp_counter_lock;
 
 #if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_INET)
 	struct cg_proto tcp_mem;
mm/memcontrol.c +0 -1
index 6ddaeba34e09..da21143550c0 100644
@@ -4179,7 +4179,6 @@ static struct mem_cgroup *mem_cgroup_alloc(void)
 	if (memcg_wb_domain_init(memcg, GFP_KERNEL))
 		goto out_free_stat;
 
-	spin_lock_init(&memcg->pcp_counter_lock);
 	return memcg;
 
 out_free_stat:
Signature · 1 line
2.6.0.rc0.131.gf624c3d
Signature · 2 lines
Michal Hocko
SUSE Labs