diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h index 24dbfcfe4a6d..3cdbd538aa5f 100644 --- a/include/linux/mm_inline.h +++ b/include/linux/mm_inline.h @@ -65,8 +65,6 @@ static inline enum lru_list page_lru_base_type(struct page *page) */ static __always_inline void __clear_page_lru_flags(struct page *page) { - VM_BUG_ON_PAGE(!PageLRU(page), page); - __ClearPageLRU(page); /* this shouldn't happen, so leave the flags to bad_page() */ @@ -88,8 +86,6 @@ static __always_inline enum lru_list page_lru(struct page *page) { enum lru_list lru; - VM_BUG_ON_PAGE(PageActive(page) && PageUnevictable(page), page); - if (PageUnevictable(page)) lru = LRU_UNEVICTABLE; else { diff --git a/mm/swap.c b/mm/swap.c index 34bedd0e7619..dda66aeb7b11 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -66,6 +66,7 @@ static void __page_cache_release(struct page *page) spin_lock_irqsave(&pgdat->lru_lock, flags); lruvec = mem_cgroup_page_lruvec(page, pgdat); + VM_BUG_ON_PAGE(!PageLRU(page), page); del_page_from_lru_list(page, lruvec); __clear_page_lru_flags(page); spin_unlock_irqrestore(&pgdat->lru_lock, flags); @@ -817,6 +818,7 @@ void release_pages(struct page **pages, int nr) } lruvec = mem_cgroup_page_lruvec(page, locked_pgdat); + VM_BUG_ON_PAGE(!PageLRU(page), page); del_page_from_lru_list(page, lruvec); __clear_page_lru_flags(page); } diff --git a/mm/vmscan.c b/mm/vmscan.c index 084f48f95afd..8c32f6d7a317 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -4562,6 +4562,7 @@ void check_move_unevictable_pages(struct pagevec *pvec) continue; if (page_evictable(page)) { + VM_BUG_ON_PAGE(PageActive(page), page); del_page_from_lru_list(page, lruvec); ClearPageUnevictable(page); add_page_to_lru_list(page, lruvec);