UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mm/memcg: Remove 'page' parameter to mem_cgroup_charge_statistics() 

The last use of 'page' was removed by commit 468c398233 ("mm:
memcontrol: switch to native NR_ANON_THPS counter"), so we can now remove
the parameter from the function.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Acked-by: Michal Hocko <mhocko@suse.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: David Howells <dhowells@redhat.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
This commit is contained in:
Matthew Wilcox (Oracle) 2021-04-29 13:40:11 -04:00
parent 874fd90caf
commit 6e0110c247
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mm/memcontrol.c
View File

@ -799,7 +799,6 @@ static unsigned long memcg_events_local(struct mem_cgroup *memcg, int event)
} }
static void mem_cgroup_charge_statistics(struct mem_cgroup *memcg, static void mem_cgroup_charge_statistics(struct mem_cgroup *memcg,
struct page *page,
int nr_pages) int nr_pages)
{ {
/* pagein of a big page is an event. So, ignore page size */ /* pagein of a big page is an event. So, ignore page size */
@ -5669,9 +5668,9 @@ static int mem_cgroup_move_account(struct page *page,
ret = 0; ret = 0;
local_irq_disable(); local_irq_disable();
mem_cgroup_charge_statistics(to, page, nr_pages); mem_cgroup_charge_statistics(to, nr_pages);
memcg_check_events(to, page); memcg_check_events(to, page);
mem_cgroup_charge_statistics(from, page, -nr_pages); mem_cgroup_charge_statistics(from, -nr_pages);
memcg_check_events(from, page); memcg_check_events(from, page);
local_irq_enable(); local_irq_enable();
out_unlock: out_unlock:
@ -6693,7 +6692,7 @@ static int charge_memcg(struct page *page, struct mem_cgroup *memcg, gfp_t gfp)
commit_charge(page, memcg); commit_charge(page, memcg);
local_irq_disable(); local_irq_disable();
mem_cgroup_charge_statistics(memcg, page, nr_pages); mem_cgroup_charge_statistics(memcg, nr_pages);
memcg_check_events(memcg, page); memcg_check_events(memcg, page);
local_irq_enable(); local_irq_enable();
out: out:
@ -6976,7 +6975,7 @@ void mem_cgroup_migrate(struct page *oldpage, struct page *newpage)
commit_charge(newpage, memcg); commit_charge(newpage, memcg);
local_irq_save(flags); local_irq_save(flags);
mem_cgroup_charge_statistics(memcg, newpage, nr_pages); mem_cgroup_charge_statistics(memcg, nr_pages);
memcg_check_events(memcg, newpage); memcg_check_events(memcg, newpage);
local_irq_restore(flags); local_irq_restore(flags);
} }
@ -7204,7 +7203,7 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
* only synchronisation we have for updating the per-CPU variables. * only synchronisation we have for updating the per-CPU variables.
*/ */
VM_BUG_ON(!irqs_disabled()); VM_BUG_ON(!irqs_disabled());
mem_cgroup_charge_statistics(memcg, page, -nr_entries); mem_cgroup_charge_statistics(memcg, -nr_entries);
memcg_check_events(memcg, page); memcg_check_events(memcg, page);
css_put(&memcg->css); css_put(&memcg->css);