filemap: Use folio_put_refs() in filemap_free_folio()

This shrinks filemap_free_folio() by 55 bytes in my .config; 24 bytes
from removing the VM_BUG_ON_FOLIO() and 31 bytes from unifying the
small/large folio paths.

We could just use folio_ref_sub() here since the caller should hold a
reference (as the VM_BUG_ON_FOLIO() was asserting), but that's fragile.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2022-01-07 13:03:48 -05:00
parent 3fe7fa5843
commit 3abb28e275

View File

@ -231,17 +231,15 @@ void __filemap_remove_folio(struct folio *folio, void *shadow)
void filemap_free_folio(struct address_space *mapping, struct folio *folio) void filemap_free_folio(struct address_space *mapping, struct folio *folio)
{ {
void (*freepage)(struct page *); void (*freepage)(struct page *);
int refs = 1;
freepage = mapping->a_ops->freepage; freepage = mapping->a_ops->freepage;
if (freepage) if (freepage)
freepage(&folio->page); freepage(&folio->page);
if (folio_test_large(folio) && !folio_test_hugetlb(folio)) { if (folio_test_large(folio) && !folio_test_hugetlb(folio))
folio_ref_sub(folio, folio_nr_pages(folio)); refs = folio_nr_pages(folio);
VM_BUG_ON_FOLIO(folio_ref_count(folio) <= 0, folio); folio_put_refs(folio, refs);
} else {
folio_put(folio);
}
} }
/** /**