Skip to content

Commit

Permalink
mm/memcg: Remove 'page' parameter to mem_cgroup_charge_statistics()
Browse files Browse the repository at this point in the history
The last use of 'page' was removed by commit 468c398 ("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) <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Acked-by: Michal Hocko <[email protected]>
Acked-by: Johannes Weiner <[email protected]>
Reviewed-by: David Howells <[email protected]>
Acked-by: Vlastimil Babka <[email protected]>
  • Loading branch information
Matthew Wilcox (Oracle) committed Sep 27, 2021
1 parent 874fd90 commit 6e0110c
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions mm/memcontrol.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 6e0110c

Please sign in to comment.