| Message ID | 20210729125755.16871-2-linmiaohe@huawei.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Cleanups and fixup for memcontrol | expand |
On Thu, Jul 29, 2021 at 5:57 AM Miaohe Lin <linmiaohe@huawei.com> wrote: > > Since commit 2d146aa3aa84 ("mm: memcontrol: switch to rstat"), last user > of memcg_stat_item_in_bytes() is gone. And since commit fa40d1ee9f15 ("mm: > vmscan: memcontrol: remove mem_cgroup_select_victim_node()"), only the > declaration of mem_cgroup_select_victim_node() is remained here. Remove > them. > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Reviewed-by: Shakeel Butt <shakeelb@google.com>
On Thu, Jul 29, 2021 at 8:57 PM Miaohe Lin <linmiaohe@huawei.com> wrote: > > Since commit 2d146aa3aa84 ("mm: memcontrol: switch to rstat"), last user > of memcg_stat_item_in_bytes() is gone. And since commit fa40d1ee9f15 ("mm: > vmscan: memcontrol: remove mem_cgroup_select_victim_node()"), only the > declaration of mem_cgroup_select_victim_node() is remained here. Remove > them. > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Reviewed-by: Muchun Song <songmuchun@bytedance.com>
On Thu, Jul 29, 2021 at 08:57:51PM +0800, Miaohe Lin wrote: > Since commit 2d146aa3aa84 ("mm: memcontrol: switch to rstat"), last user > of memcg_stat_item_in_bytes() is gone. And since commit fa40d1ee9f15 ("mm: > vmscan: memcontrol: remove mem_cgroup_select_victim_node()"), only the > declaration of mem_cgroup_select_victim_node() is remained here. Remove > them. > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Acked-by: Roman Gushchin <guro@fb.com> Thanks!
On Thu 29-07-21 20:57:51, Miaohe Lin wrote: > Since commit 2d146aa3aa84 ("mm: memcontrol: switch to rstat"), last user > of memcg_stat_item_in_bytes() is gone. And since commit fa40d1ee9f15 ("mm: > vmscan: memcontrol: remove mem_cgroup_select_victim_node()"), only the > declaration of mem_cgroup_select_victim_node() is remained here. Remove > them. > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Acked-by: Michal Hocko <mhocko@suse.com> > --- > include/linux/memcontrol.h | 12 ------------ > 1 file changed, 12 deletions(-) > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index 7028d8e4a3d7..04437504444f 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -606,13 +606,6 @@ static inline bool PageMemcgKmem(struct page *page) > return folio_memcg_kmem(page_folio(page)); > } > > -static __always_inline bool memcg_stat_item_in_bytes(int idx) > -{ > - if (idx == MEMCG_PERCPU_B) > - return true; > - return vmstat_item_in_bytes(idx); > -} > - > static inline bool mem_cgroup_is_root(struct mem_cgroup *memcg) > { > return (memcg == root_mem_cgroup); > @@ -916,11 +909,6 @@ static inline bool mem_cgroup_online(struct mem_cgroup *memcg) > return !!(memcg->css.flags & CSS_ONLINE); > } > > -/* > - * For memory reclaim. > - */ > -int mem_cgroup_select_victim_node(struct mem_cgroup *memcg); > - > void mem_cgroup_update_lru_size(struct lruvec *lruvec, enum lru_list lru, > int zid, int nr_pages); > > -- > 2.23.0
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 7028d8e4a3d7..04437504444f 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -606,13 +606,6 @@ static inline bool PageMemcgKmem(struct page *page) return folio_memcg_kmem(page_folio(page)); } -static __always_inline bool memcg_stat_item_in_bytes(int idx) -{ - if (idx == MEMCG_PERCPU_B) - return true; - return vmstat_item_in_bytes(idx); -} - static inline bool mem_cgroup_is_root(struct mem_cgroup *memcg) { return (memcg == root_mem_cgroup); @@ -916,11 +909,6 @@ static inline bool mem_cgroup_online(struct mem_cgroup *memcg) return !!(memcg->css.flags & CSS_ONLINE); } -/* - * For memory reclaim. - */ -int mem_cgroup_select_victim_node(struct mem_cgroup *memcg); - void mem_cgroup_update_lru_size(struct lruvec *lruvec, enum lru_list lru, int zid, int nr_pages);
Since commit 2d146aa3aa84 ("mm: memcontrol: switch to rstat"), last user of memcg_stat_item_in_bytes() is gone. And since commit fa40d1ee9f15 ("mm: vmscan: memcontrol: remove mem_cgroup_select_victim_node()"), only the declaration of mem_cgroup_select_victim_node() is remained here. Remove them. Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> --- include/linux/memcontrol.h | 12 ------------ 1 file changed, 12 deletions(-)