Commit 6e0110c2 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle)
Browse files

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



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

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Reviewed-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
parent 874fd90c

mm/memcontrol.c

+5 −6
Original line number Diff line number Diff line
@@ -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,

					 struct page *page,

					 int nr_pages)

{

	/* 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;



	local_irq_disable();

	mem_cgroup_charge_statistics(to, page, nr_pages);

	mem_cgroup_charge_statistics(to, nr_pages);

	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);

	local_irq_enable();

out_unlock:
@@ -6693,7 +6692,7 @@ static int charge_memcg(struct page *page, struct mem_cgroup *memcg, gfp_t gfp) 
	commit_charge(page, memcg);



	local_irq_disable();

	mem_cgroup_charge_statistics(memcg, page, nr_pages);

	mem_cgroup_charge_statistics(memcg, nr_pages);

	memcg_check_events(memcg, page);

	local_irq_enable();

out:
@@ -6976,7 +6975,7 @@ void mem_cgroup_migrate(struct page *oldpage, struct page *newpage) 
	commit_charge(newpage, memcg);



	local_irq_save(flags);

	mem_cgroup_charge_statistics(memcg, newpage, nr_pages);

	mem_cgroup_charge_statistics(memcg, nr_pages);

	memcg_check_events(memcg, newpage);

	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.

	 */

	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);



	css_put(&memcg->css);