| Message ID | 20201207220949.830352-9-yuzhao@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mm: lru related cleanups | expand |
Reviewed-by: Alex Shi <alex.shi@linux.alibaba.com> 在 2020/12/8 上午6:09, Yu Zhao 写道: > We've removed all other references to this function. > > Signed-off-by: Yu Zhao <yuzhao@google.com> > --- > include/linux/mm_inline.h | 27 ++++++--------------------- > 1 file changed, 6 insertions(+), 21 deletions(-) > > diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h > index 6d907a4dd6ad..7183c7a03f09 100644 > --- a/include/linux/mm_inline.h > +++ b/include/linux/mm_inline.h > @@ -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; > } > >
diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h index 6d907a4dd6ad..7183c7a03f09 100644 --- a/include/linux/mm_inline.h +++ b/include/linux/mm_inline.h @@ -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; }
We've removed all other references to this function. Signed-off-by: Yu Zhao <yuzhao@google.com> --- include/linux/mm_inline.h | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-)