Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09612fa6 authored by Naoya Horiguchi's avatar Naoya Horiguchi Committed by Linus Torvalds
Browse files

mm: hugetlb: return immediately for hugetlb page in __delete_from_page_cache() 

We avoid calling __mod_node_page_state(NR_FILE_PAGES) for hugetlb page
now, but it's not enough because later code doesn't handle hugetlb
properly.  Actually in our testing, WARN_ON_ONCE(PageDirty(page)) at the
end of this function fires for hugetlb, which makes no sense.  So we
should return immediately for hugetlb pages.

Link: http://lkml.kernel.org/r/1496305019-5493-3-git-send-email-n-horiguchi@ah.jp.nec.com


Signed-off-by: default avatarNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Cc: Anshuman Khandual <khandual@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 243abd5b

mm/filemap.c

+5 −3
Original line number Diff line number Diff line
@@ -239,14 +239,16 @@ void __delete_from_page_cache(struct page *page, void *shadow) 
	/* Leave page->index set: truncation lookup relies upon it */



	/* hugetlb pages do not participate in page cache accounting. */

	if (!PageHuge(page))

	if (PageHuge(page))

		return;



	__mod_node_page_state(page_pgdat(page), NR_FILE_PAGES, -nr);

	if (PageSwapBacked(page)) {

		__mod_node_page_state(page_pgdat(page), NR_SHMEM, -nr);

		if (PageTransHuge(page))

			__dec_node_page_state(page, NR_SHMEM_THPS);

	} else {

		VM_BUG_ON_PAGE(PageTransHuge(page) && !PageHuge(page), page);

		VM_BUG_ON_PAGE(PageTransHuge(page), page);

	}



	/*