mm/memcg: Remove soft_limit_tree_node()

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>
Reviewed-by: David Howells <dhowells@redhat.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index d57ff5c5d330a87aa0cc06c0b195e3fd1d876360..f70e33d691aa6e2a45aa721ea080dd16bbe152cf 100644 (file)
--- 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