]> git.baikalelectronics.ru Git - kernel.git/commitdiff
include/linux/mm_inline.h: fold page_lru_base_type() into its sole caller
authorYu Zhao <yuzhao@google.com>
Wed, 24 Feb 2021 20:08:36 +0000 (12:08 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Feb 2021 21:38:33 +0000 (13:38 -0800)
We've removed all other references to this function.

Link: https://lore.kernel.org/linux-mm/20201207220949.830352-9-yuzhao@google.com/
Link: https://lkml.kernel.org/r/20210122220600.906146-9-yuzhao@google.com
Signed-off-by: Yu Zhao <yuzhao@google.com>
Reviewed-by: Alex Shi <alex.shi@linux.alibaba.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Roman Gushchin <guro@fb.com>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/linux/mm_inline.h

index 6d907a4dd6ad6d8474b172e422f1175578ae6091..7183c7a03f09403a9898729b25dbacfc88d44e85 100644 (file)
@@ -45,21 +45,6 @@ static __always_inline void update_lru_size(struct lruvec *lruvec,
 #endif
 }
 
-/**
- * page_lru_base_type - which LRU list type should a page be on?
- * @page: the page to test
- *
- * Used for LRU list index arithmetic.
- *
- * Returns the base LRU type - file or anon - @page should be on.
- */
-static inline enum lru_list page_lru_base_type(struct page *page)
-{
-       if (page_is_file_lru(page))
-               return LRU_INACTIVE_FILE;
-       return LRU_INACTIVE_ANON;
-}
-
 /**
  * __clear_page_lru_flags - clear page lru flags before releasing a page
  * @page: the page that was on lru and now has a zero reference
@@ -92,12 +77,12 @@ static __always_inline enum lru_list page_lru(struct page *page)
        VM_BUG_ON_PAGE(PageActive(page) && PageUnevictable(page), page);
 
        if (PageUnevictable(page))
-               lru = LRU_UNEVICTABLE;
-       else {
-               lru = page_lru_base_type(page);
-               if (PageActive(page))
-                       lru += LRU_ACTIVE;
-       }
+               return LRU_UNEVICTABLE;
+
+       lru = page_is_file_lru(page) ? LRU_INACTIVE_FILE : LRU_INACTIVE_ANON;
+       if (PageActive(page))
+               lru += LRU_ACTIVE;
+
        return lru;
 }