Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[karo-tx-linux.git] / mm / filemap.c

diff --git a/mm/filemap.c b/mm/filemap.c
index 3247b4208034723c82ad05f0ca4cc880cbdc91d9..a49702445ce05beeb8d80b46f0ee57c116986be2 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -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))
-               __mod_node_page_state(page_pgdat(page), NR_FILE_PAGES, -nr);
+       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);
        }
 
        /*