lkml.org 
[lkml]   [2021]   [Jul]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v13 034/137] mm/memcg: Remove 'page' parameter to mem_cgroup_charge_statistics()
    Date
    The last use of 'page' was removed by commit 468c398233da ("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>
    ---
    mm/memcontrol.c | 11 +++++------
    1 file changed, 5 insertions(+), 6 deletions(-)

    diff --git a/mm/memcontrol.c b/mm/memcontrol.c
    index ae1f5d0cb581..ee892daecb8b 100644
    --- a/mm/memcontrol.c
    +++ b/mm/memcontrol.c
    @@ -831,7 +831,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 */
    @@ -5692,9 +5691,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:
    @@ -6715,7 +6714,7 @@ static int __mem_cgroup_charge(struct page *page, struct mem_cgroup *memcg,
    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:
    @@ -7006,7 +7005,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);
    }
    @@ -7236,7 +7235,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);
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-07-12 05:27    [W:4.093 / U:0.456 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site