mm-drop-page_index-and-simplify-folio_index.patch removed from -mm tree
The quilt patch titled
Subject: mm: drop page_index and simplify folio_index
has been removed from the -mm tree. Its filename was
mm-drop-page_index-and-simplify-folio_index.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Kairui Song <[email protected]>
Subject: mm: drop page_index and simplify folio_index
Date: Wed, 22 May 2024 01:58:52 +0800
There are two helpers for retrieving the index within address space for mixed usage of swap cache and page cache:
- page_index
- folio_index
This commit drops page_index, as we have eliminated all users, and converts folio_index's helper __page_file_index to use folio to avoid the page conversion.
---
include/linux/mm.h | 13 ------------- include/linux/pagemap.h | 8 ++++---- mm/swapfile.c | 7 +++---- 3 files changed, 7 insertions(+), 21 deletions(-)
include/linux/mm.h renamed from include/linux/mm.h~mm-drop-page_index-and-simplify-folio_index +0 -13
@@ -2290,19 +2290,6 @@ static inline void *folio_address(constreturn page_address (&folio->page); } -extern pgoff_t __page_file_index (struct page *page); - -/* -* Return the pagecache index of the passed page. Regular pagecache pages -* use ->index whereas swapcache pages use swp_offset(->private) -*/ -static inline pgoff_t page_index (struct page *page) -{ -if (unlikely (PageSwapCache (page))) -return __page_file_index (page); -return page->index; -} -/* * Return true only if the page has been allocated with * ALLOC_NO_WATERMARKS and the low watermark was not
include/linux/pagemap.h renamed from include/linux/pagemap.h~mm-drop-page_index-and-simplify-folio_index +4 -4
@@ -792,7 +792,7 @@ static inline struct page *grab_cache_pa mapping_gfp_mask(mapping)); } -#define swapcache_index (folio) __page_file_index(&(folio)->page) +extern pgoff_t __folio_swap_cache_index (struct folio *folio);/** * folio_index - File index of a folio.
@@ -807,9 +807,9 @@ static inline struct page *grab_cache_pa*/ static inline pgoff_t folio_index (struct folio *folio) { -if (unlikely (folio_test_swapcache (folio))) -return swapcache_index (folio); -return folio->index; +if (unlikely (folio_test_swapcache (folio))) +return __folio_swap_cache_index (folio); +return folio->index; }/**
mm/swapfile.c renamed from mm/swapfile.c~mm-drop-page_index-and-simplify-folio_index +3 -4
@@ -3449,12 +3449,11 @@ struct address_space *swapcache_mapping( }EXPORT_SYMBOL_GPL (swapcache_mapping); -pgoff_t __page_file_index (struct page *page) +pgoff_t __folio_swap_cache_index (struct folio *folio) { -swp_entry_t swap =page_swap_entry (page); -return swp_offset (swap); +return swp_offset (folio->swap); } -EXPORT_SYMBOL_GPL (__page_file_index); +EXPORT_SYMBOL_GPL (__folio_swap_cache_index);/* * add_swap_count_continuation - called when a swap count is duplicated
_
Patches currently in -mm which might be from [email protected] are