mm-vmpressure-replace-vmpressure_to_css-with-vmpressure_to_memcg.patch removed from -mm tree
The patch titled
Subject: mm/vmpressure: replace vmpressure_to_css() with vmpressure_to_memcg()
has been removed from the -mm tree. Its filename was
mm-vmpressure-replace-vmpressure_to_css-with-vmpressure_to_memcg.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Hui Su <[email protected]>
Subject: 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]>
Acked-by Michal Hocko <[email protected]>
Acked-by Chris Down <[email protected]>
Cc Johannes Weiner <[email protected]>
Cc Vladimir Davydov <[email protected]>
Signed-off-by Andrew Morton <[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 renamed from include/linux/vmpressure.h~mm-vmpressure-replace-vmpressure_to_css-with-vmpressure_to_memcg +1 -1
@@ -37,7 +37,7 @@ extern void vmpressure_prio(gfp_t gfp, sextern 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 renamed from mm/memcontrol.c~mm-vmpressure-replace-vmpressure_to_css-with-vmpressure_to_memcg +2 -2
@@ -256,9 +256,9 @@ struct vmpressure *memcg_to_vmpressure(sreturn &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 renamed from mm/vmpressure.c~mm-vmpressure-replace-vmpressure_to_css-with-vmpressure_to_memcg +1 -2
@@ -74,8 +74,7 @@ static struct vmpressure *work_to_vmpresstatic 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)
_
Patches currently in -mm which might be from [email protected] are