mm-slab-rename-uncharge_slab_page-to-unaccount_slab_page.patch removed from -mm tree
The patch titled
Subject: mm: slab: rename (un)charge_slab_page() to (un)account_slab_page()
has been removed from the -mm tree. Its filename was
mm-slab-rename-uncharge_slab_page-to-unaccount_slab_page.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Roman Gushchin <[email protected]>
Subject: mm: slab: rename (un)charge_slab_page() to (un)account_slab_page()
charge_slab_page() and uncharge_slab_page() are not related anymore to memcg charging and uncharging. In order to make their names less confusing, let's rename them to account_slab_page() and unaccount_slab_page() respectively.
---
mm/slab.c | 4 ++-- mm/slab.h | 8 ++++---- mm/slub.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-)
mm/slab.c renamed from mm/slab.c~mm-slab-rename-uncharge_slab_page-to-unaccount_slab_page +2 -2
@@ -1379,7 +1379,7 @@ static struct page *kmem_getpages(structreturn NULL ; } -charge_slab_page (page, cachep->gfporder, cachep); +account_slab_page (page, cachep->gfporder, cachep);__SetPageSlab (page);/* Record if ALLOC_NO_WATERMARKS was set when allocating the slab */ if (sk_memalloc_socks () &&page_is_pfmemalloc (page))
@@ -1403,7 +1403,7 @@ static void kmem_freepages(struct kmem_cif (current->reclaim_state) current->reclaim_state->reclaimed_slab +=1 << order; -uncharge_slab_page (page, order, cachep); +unaccount_slab_page (page, order, cachep);__free_pages (page, order); }
mm/slab.h renamed from mm/slab.h~mm-slab-rename-uncharge_slab_page-to-unaccount_slab_page +4 -4
@@ -423,15 +423,15 @@ static inline struct kmem_cache *virt_toreturn page->slab_cache; } -static __always_inline void charge_slab_page(struct page *page, int order, -struct kmem_cache *s) +static __always_inline void account_slab_page(struct page *page, int order, +struct kmem_cache *s) {mod_node_page_state (page_pgdat (page),cache_vmstat_idx (s),PAGE_SIZE << order); } -static __always_inline void uncharge_slab_page(struct page *page, int order, -struct kmem_cache *s) +static __always_inline void unaccount_slab_page(struct page *page, int order, +struct kmem_cache *s) {if (memcg_kmem_enabled ())memcg_free_page_obj_cgroups (page);
mm/slub.c renamed from mm/slub.c~mm-slab-rename-uncharge_slab_page-to-unaccount_slab_page +2 -2
@@ -1621,7 +1621,7 @@ static inline struct page *alloc_slab_pa page =__alloc_pages_node (node, flags, order);if (page) -charge_slab_page (page, order, s); +account_slab_page (page, order, s);return page; }
@@ -1844,7 +1844,7 @@ static void __free_slab(struct kmem_cach page->mapping =NULL ;if (current->reclaim_state) current->reclaim_state->reclaimed_slab += pages; -uncharge_slab_page (page, order, s); +unaccount_slab_page (page, order, s);__free_pages (page, order); }
_
Patches currently in -mm which might be from [email protected] are
percpu-return-number-of-released-bytes-from-pcpu_free_area.patch mm-memcg-percpu-account-percpu-memory-to-memory-cgroups.patch mm-memcg-percpu-per-memcg-percpu-memory-statistics.patch mm-memcg-percpu-per-memcg-percpu-memory-statistics-v3.patch mm-memcg-charge-memcg-percpu-memory-to-the-parent-cgroup.patch kselftests-cgroup-add-perpcu-memory-accounting-test.patch mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings.patch mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix.patch