mm/vmpressure: replace vmpressure_to_css() with vmpressure_to_memcg()
Subsystems (4)
PATCH 1/1 mm/vmpressure: replace vmpressure_to_css() with vmpressure_to_memcg()
We can get memcg directly form vmpr instead of vmpr->memcg->css->memcg, so add a new func helper vmpressure_to_memcg().
And no code will use vmpressure_to_css(), so delete it.
Signed-off-by Hui Su <[email protected]>
--- include/linux/vmpressure.h | 2 +- mm/memcontrol.c | 4 ++-- mm/vmpressure.c | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-)
include/linux/vmpressure.h +1 -1
@@ -37,7 +37,7 @@ extern void vmpressure_prio(gfp_t gfp, struct mem_cgroup *memcg, int prio);extern void vmpressure_init (struct vmpressure *vmpr);extern void vmpressure_cleanup (struct vmpressure *vmpr);extern struct vmpressure *memcg_to_vmpressure (struct mem_cgroup *memcg); -extern struct cgroup_subsys_state *vmpressure_to_css (struct vmpressure *vmpr); +extern struct mem_cgroup *vmpressure_to_memcg (struct vmpressure *vmpr);extern int vmpressure_register_event (struct mem_cgroup *memcg,struct eventfd_ctx *eventfd,const char *args);
mm/memcontrol.c +2 -2
@@ -247,9 +247,9 @@ struct vmpressure *memcg_to_vmpressure(struct mem_cgroup *memcg)return &memcg->vmpressure; } -struct cgroup_subsys_state *vmpressure_to_css (struct vmpressure *vmpr) +struct mem_cgroup *vmpressure_to_memcg (struct vmpressure *vmpr) { - return &container_of(vmpr, struct mem_cgroup, vmpressure)->css; + return container_of(vmpr, struct mem_cgroup, vmpressure); }#ifdef CONFIG_MEMCG_KMEM
mm/vmpressure.c +1 -2
@@ -74,8 +74,7 @@ static struct vmpressure *work_to_vmpressure(struct work_struct *work)static struct vmpressure *vmpressure_parent (struct vmpressure *vmpr) { -struct cgroup_subsys_state *css =vmpressure_to_css (vmpr); -struct mem_cgroup *memcg =mem_cgroup_from_css (css); +struct mem_cgroup *memcg =vmpressure_to_memcg (vmpr); memcg =parent_mem_cgroup (memcg);if (!memcg)
Signature · 1 line
2.25.1
Quoted 3 lines · Hui Su
We can get memcg directly form vmpr instead of
vmpr->memcg->css->memcg, so add a new func helpervmpressure_to_memcg().
And no code will usevmpressure_to_css(), so delete it.
Nice cleanup.
Quoted 1 line
Signed-off-by Hui Su <[email protected]>
Thanks!
Quoted 51 lines
--- include/linux/vmpressure.h | 2 +- mm/memcontrol.c | 4 ++-- mm/vmpressure.c | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-)include/linux/vmpressure.h +1
-1@@ -37,7 +37,7 @@ extern void vmpressure_prio(gfp_t gfp, struct mem_cgroup *memcg, int prio);extern void vmpressure_init (struct vmpressure *vmpr);extern void vmpressure_cleanup (struct vmpressure *vmpr);extern struct vmpressure *memcg_to_vmpressure (struct mem_cgroup *memcg); -extern struct cgroup_subsys_state *vmpressure_to_css (struct vmpressure *vmpr); +extern struct mem_cgroup *vmpressure_to_memcg (struct vmpressure *vmpr);extern int vmpressure_register_event (struct mem_cgroup *memcg,struct eventfd_ctx *eventfd,const char *args);mm/memcontrol.c +2
-2@@ -247,9 +247,9 @@ struct vmpressure *memcg_to_vmpressure(struct mem_cgroup *memcg)return &memcg->vmpressure; } -struct cgroup_subsys_state *vmpressure_to_css (struct vmpressure *vmpr) +struct mem_cgroup *vmpressure_to_memcg (struct vmpressure *vmpr) { - return &container_of(vmpr, struct mem_cgroup, vmpressure)->css; + return container_of(vmpr, struct mem_cgroup, vmpressure); }#ifdef CONFIG_MEMCG_KMEM mm/vmpressure.c +1
-2@@ -74,8 +74,7 @@ static struct vmpressure *work_to_vmpressure(struct work_struct *work)static struct vmpressure *vmpressure_parent (struct vmpressure *vmpr) { -struct cgroup_subsys_state *css =vmpressure_to_css (vmpr); -struct mem_cgroup *memcg =mem_cgroup_from_css (css); +struct mem_cgroup *memcg =vmpressure_to_memcg (vmpr); memcg =parent_mem_cgroup (memcg);if (!memcg)Signature · 1 line
2.25.1
Signature · 2 lines
Michal Hocko SUSE Labs
Thanks! This looks like a reasonable cleanup.
Quoted 5 lines · Hui Su
We can get memcg directly form vmpr instead of
vmpr->memcg->css->memcg, so add a new func helpervmpressure_to_memcg().
And no code will usevmpressure_to_css(), so delete it.Signed-off-by Hui Su <[email protected]>
Acked-by Chris Down <[email protected]>
Quoted 53 lines
---
include/linux/vmpressure.h | 2 +- mm/memcontrol.c | 4 ++-- mm/vmpressure.c | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-)include/linux/vmpressure.h +1
-1@@ -37,7 +37,7 @@ extern void vmpressure_prio(gfp_t gfp, struct mem_cgroup *memcg, int prio);extern void vmpressure_init (struct vmpressure *vmpr);extern void vmpressure_cleanup (struct vmpressure *vmpr);extern struct vmpressure *memcg_to_vmpressure (struct mem_cgroup *memcg); -extern struct cgroup_subsys_state *vmpressure_to_css (struct vmpressure *vmpr); +extern struct mem_cgroup *vmpressure_to_memcg (struct vmpressure *vmpr);extern int vmpressure_register_event (struct mem_cgroup *memcg,struct eventfd_ctx *eventfd,const char *args);mm/memcontrol.c +2
-2@@ -247,9 +247,9 @@ struct vmpressure *memcg_to_vmpressure(struct mem_cgroup *memcg)return &memcg->vmpressure; } -struct cgroup_subsys_state *vmpressure_to_css (struct vmpressure *vmpr) +struct mem_cgroup *vmpressure_to_memcg (struct vmpressure *vmpr) { - return &container_of(vmpr, struct mem_cgroup, vmpressure)->css; + return container_of(vmpr, struct mem_cgroup, vmpressure); }#ifdef CONFIG_MEMCG_KMEM mm/vmpressure.c +1
-2@@ -74,8 +74,7 @@ static struct vmpressure *work_to_vmpressure(struct work_struct *work)static struct vmpressure *vmpressure_parent (struct vmpressure *vmpr) { -struct cgroup_subsys_state *css =vmpressure_to_css (vmpr); -struct mem_cgroup *memcg =mem_cgroup_from_css (css); +struct mem_cgroup *memcg =vmpressure_to_memcg (vmpr); memcg =parent_mem_cgroup (memcg);if (!memcg)Signature · 1 line
2.25.1