| Message ID | 20200109202659.752357-3-guro@fb.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mm: memcg: kmem API cleanup | expand |
On Thu, Jan 9, 2020 at 12:27 PM Roman Gushchin <guro@fb.com> wrote: > > Drop the unused page argument and put the memcg pointer at the first > place. This make the function consistent with its peers: > __memcg_kmem_uncharge_memcg(), memcg_kmem_charge_memcg(), etc. > > Signed-off-by: Roman Gushchin <guro@fb.com> Why not squash this patch in the previous one? Reviewed-by: Shakeel Butt <shakeelb@google.com>
On Fri, Jan 10, 2020 at 04:23:52PM -0800, Shakeel Butt wrote: > On Thu, Jan 9, 2020 at 12:27 PM Roman Gushchin <guro@fb.com> wrote: > > > > Drop the unused page argument and put the memcg pointer at the first > > place. This make the function consistent with its peers: > > __memcg_kmem_uncharge_memcg(), memcg_kmem_charge_memcg(), etc. > > > > Signed-off-by: Roman Gushchin <guro@fb.com> > > Why not squash this patch in the previous one? No particular reason, could be squashed too. Just made these changes one by one. Can be perfectly squashed, but probably it's not worth another version. > > Reviewed-by: Shakeel Butt <shakeelb@google.com> Thank you for the review!
On Thu, Jan 09, 2020 at 12:26:55PM -0800, Roman Gushchin wrote: > Drop the unused page argument and put the memcg pointer at the first > place. This make the function consistent with its peers: > __memcg_kmem_uncharge_memcg(), memcg_kmem_charge_memcg(), etc. > > Signed-off-by: Roman Gushchin <guro@fb.com> Acked-by: Johannes Weiner <hannes@cmpxchg.org>
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index c954209fd685..900a9f884260 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1409,8 +1409,8 @@ static inline int memcg_kmem_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp, return 0; } -static inline void memcg_kmem_uncharge_memcg(struct page *page, int order, - struct mem_cgroup *memcg) +static inline void memcg_kmem_uncharge_memcg(struct mem_cgroup *memcg, + int order) { if (memcg_kmem_enabled()) __memcg_kmem_uncharge_memcg(memcg, 1 << order); diff --git a/mm/slab.h b/mm/slab.h index c4c93e991250..e7da63fb8211 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -395,7 +395,7 @@ static __always_inline void memcg_uncharge_slab(struct page *page, int order, if (likely(!mem_cgroup_is_root(memcg))) { lruvec = mem_cgroup_lruvec(memcg, page_pgdat(page)); mod_lruvec_state(lruvec, cache_vmstat_idx(s), -(1 << order)); - memcg_kmem_uncharge_memcg(page, order, memcg); + memcg_kmem_uncharge_memcg(memcg, order); } else { mod_node_page_state(page_pgdat(page), cache_vmstat_idx(s), -(1 << order));
Drop the unused page argument and put the memcg pointer at the first place. This make the function consistent with its peers: __memcg_kmem_uncharge_memcg(), memcg_kmem_charge_memcg(), etc. Signed-off-by: Roman Gushchin <guro@fb.com> --- include/linux/memcontrol.h | 4 ++-- mm/slab.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)