From: "Kirill A. Shutemov" <kirill.shutemov@xxxxxxxxxxxxxxx> As with add_to_page_cache_locked() we handle HPAGE_CACHE_NR pages a time. Signed-off-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx> --- mm/filemap.c | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index b0c7c8c..657ce82 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -115,6 +115,9 @@ void __delete_from_page_cache(struct page *page) { struct address_space *mapping = page->mapping; + bool thp = PageTransHuge(page) && + IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE_PAGECACHE); + int nr; trace_mm_filemap_delete_from_page_cache(page); /* @@ -127,13 +130,29 @@ void __delete_from_page_cache(struct page *page) else cleancache_invalidate_page(mapping, page); - radix_tree_delete(&mapping->page_tree, page->index); + if (thp) { + int i; + + nr = HPAGE_CACHE_NR; + radix_tree_delete(&mapping->page_tree, page->index); + for (i = 1; i < HPAGE_CACHE_NR; i++) { + radix_tree_delete(&mapping->page_tree, page->index + i); + page[i].mapping = NULL; + page_cache_release(page + i); + } + __dec_zone_page_state(page, NR_FILE_TRANSPARENT_HUGEPAGES); + } else { + BUG_ON(PageTransHuge(page)); + nr = 1; + radix_tree_delete(&mapping->page_tree, page->index); + } + page->mapping = NULL; /* Leave page->index set: truncation lookup relies upon it */ - mapping->nrpages--; - __dec_zone_page_state(page, NR_FILE_PAGES); + mapping->nrpages -= nr; + __mod_zone_page_state(page_zone(page), NR_FILE_PAGES, -nr); if (PageSwapBacked(page)) - __dec_zone_page_state(page, NR_SHMEM); + __mod_zone_page_state(page_zone(page), NR_SHMEM, -nr); BUG_ON(page_mapped(page)); /* @@ -144,8 +163,8 @@ void __delete_from_page_cache(struct page *page) * having removed the page entirely. */ if (PageDirty(page) && mapping_cap_account_dirty(mapping)) { - dec_zone_page_state(page, NR_FILE_DIRTY); - dec_bdi_stat(mapping->backing_dev_info, BDI_RECLAIMABLE); + mod_zone_page_state(page_zone(page), NR_FILE_DIRTY, -nr); + add_bdi_stat(mapping->backing_dev_info, BDI_RECLAIMABLE, -nr); } } -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html