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 036/137] mm/memcg: Remove soft_limit_tree_node()
    Date
    Opencode this one-line function in its three callers.

    Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
    Acked-by: Michal Hocko <mhocko@suse.com>
    Acked-by: Johannes Weiner <hannes@cmpxchg.org>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    ---
    mm/memcontrol.c | 12 +++---------
    1 file changed, 3 insertions(+), 9 deletions(-)

    diff --git a/mm/memcontrol.c b/mm/memcontrol.c
    index d57ff5c5d330..f70e33d691aa 100644
    --- a/mm/memcontrol.c
    +++ b/mm/memcontrol.c
    @@ -451,12 +451,6 @@ ino_t page_cgroup_ino(struct page *page)
    return ino;
    }

    -static struct mem_cgroup_tree_per_node *
    -soft_limit_tree_node(int nid)
    -{
    - return soft_limit_tree.rb_tree_per_node[nid];
    -}
    -
    static void __mem_cgroup_insert_exceeded(struct mem_cgroup_per_node *mz,
    struct mem_cgroup_tree_per_node *mctz,
    unsigned long new_usage_in_excess)
    @@ -533,7 +527,7 @@ static void mem_cgroup_update_tree(struct mem_cgroup *memcg, int nid)
    struct mem_cgroup_per_node *mz;
    struct mem_cgroup_tree_per_node *mctz;

    - mctz = soft_limit_tree_node(nid);
    + mctz = soft_limit_tree.rb_tree_per_node[nid];
    if (!mctz)
    return;
    /*
    @@ -572,7 +566,7 @@ static void mem_cgroup_remove_from_trees(struct mem_cgroup *memcg)

    for_each_node(nid) {
    mz = memcg->nodeinfo[nid];
    - mctz = soft_limit_tree_node(nid);
    + mctz = soft_limit_tree.rb_tree_per_node[nid];
    if (mctz)
    mem_cgroup_remove_exceeded(mz, mctz);
    }
    @@ -3420,7 +3414,7 @@ unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order,
    if (order > 0)
    return 0;

    - mctz = soft_limit_tree_node(pgdat->node_id);
    + mctz = soft_limit_tree.rb_tree_per_node[pgdat->node_id];

    /*
    * Do not even bother to check the largest node if the root
    --
    2.30.2
    \
     
     \ /
      Last update: 2022-09-17 16:11    [W:4.096 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site