On Wed 30-06-21 05:00:20, Matthew Wilcox wrote:
> Opencode this one-line function in its three callers.
>
> Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxxx>
> ---
> mm/memcontrol.c | 12 +++---------
> 1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index 29b28a050707..29fdb70dca42 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -446,12 +446,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)
> @@ -528,7 +522,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;
> /*
> @@ -567,7 +561,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);
> }
> @@ -3415,7 +3409,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
--
Michal Hocko
SUSE Labs
