| Message ID | 20230815032645.1393700-6-willy@infradead.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Remove _folio_dtor and _folio_order | expand |
On 15.08.23 05:26, Matthew Wilcox (Oracle) wrote: > Inline it into its one caller. > > Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> > --- > mm/page_alloc.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index 804982faba4e..21af71aea6eb 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -589,12 +589,6 @@ static inline void free_the_page(struct page *page, unsigned int order) > * This usage means that zero-order pages may not be compound. > */ > > -static void free_compound_page(struct folio *folio) > -{ > - mem_cgroup_uncharge(folio); > - free_the_page(&folio->page, folio_order(folio)); > -} > - > void prep_compound_page(struct page *page, unsigned int order) > { > int i; > @@ -618,7 +612,8 @@ void destroy_large_folio(struct folio *folio) > > if (folio_test_transhuge(folio) && dtor == TRANSHUGE_PAGE_DTOR) > free_transhuge_folio(folio); > - free_compound_page(folio); > + mem_cgroup_uncharge(folio); > + free_the_page(&folio->page, folio_order(folio)); > } > > static inline void set_buddy_order(struct page *page, unsigned int order) I'd squash that into the previous commit Acked-by: David Hildenbrand <david@redhat.com>
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 804982faba4e..21af71aea6eb 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -589,12 +589,6 @@ static inline void free_the_page(struct page *page, unsigned int order) * This usage means that zero-order pages may not be compound. */ -static void free_compound_page(struct folio *folio) -{ - mem_cgroup_uncharge(folio); - free_the_page(&folio->page, folio_order(folio)); -} - void prep_compound_page(struct page *page, unsigned int order) { int i; @@ -618,7 +612,8 @@ void destroy_large_folio(struct folio *folio) if (folio_test_transhuge(folio) && dtor == TRANSHUGE_PAGE_DTOR) free_transhuge_folio(folio); - free_compound_page(folio); + mem_cgroup_uncharge(folio); + free_the_page(&folio->page, folio_order(folio)); } static inline void set_buddy_order(struct page *page, unsigned int order)
Inline it into its one caller. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> --- mm/page_alloc.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)