Skip to contentSkip to conversation

mm-swap-remove-no-longer-used-swap-mapping-helper.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message May 13, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm, swap: remove no longer used swap mapping helper
has been removed from the -mm tree. Its filename was
mm-swap-remove-no-longer-used-swap-mapping-helper.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, swap: remove no longer used swap mapping helper
Date: Thu, 1 May 2025 02:10:52 +0800

This helper existed to fix the circular header dependency issue but it is no longer used since commit 0d40cfe63a2f ("fs: remove folio_file_mapping()"), remove it.

Cc Chao Yu <[email protected]>
Cc Chris Li <[email protected]>
Cc Chris Mason <[email protected]>
Cc Christian Brauner <[email protected]>
Cc David Sterba <[email protected]>
Cc "Huang, Ying" <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc Jaegeuk Kim <[email protected]>
Cc Joanne Koong <[email protected]>
Cc Johannes Weiner <[email protected]>
Cc Josef Bacik <[email protected]>
Cc Miklos Szeredi <[email protected]>
Cc Nhat Pham <[email protected]>
Cc Qu Wenruo <[email protected]>
Cc Yosry Ahmed <[email protected]>

---

 include/linux/pagemap.h |    1 -
 mm/swapfile.c           |    9 ---------
 2 files changed, 10 deletions(-)
include/linux/pagemap.h renamed from include/linux/pagemap.h~mm-swap-remove-no-longer-used-swap-mapping-helper +0 -1
@@ -533,7 +533,6 @@ static inline void filemap_nr_thps_dec(s
 }
 
 struct address_space *folio_mapping(struct folio *);
-struct address_space *swapcache_mapping(struct folio *);
 
 /**
  * folio_flush_mapping - Find the file mapping this folio belongs to.
mm/swapfile.c renamed from mm/swapfile.c~mm-swap-remove-no-longer-used-swap-mapping-helper +0 -9
@@ -3663,15 +3663,6 @@ struct swap_info_struct *swp_swap_info(s
 }
 
 /*
- * out-of-line methods to avoid include hell.
- */
-struct address_space *swapcache_mapping(struct folio *folio)
-{
-	return swp_swap_info(folio->swap)->swap_file->f_mapping;
-}
-EXPORT_SYMBOL_GPL(swapcache_mapping);
-
-/*
  * add_swap_count_continuation - called when a swap count is duplicated
  * beyond SWAP_MAP_MAX, it allocates a new page and links that to the entry's
  * page of the original vmalloc'ed swap_map, to hold the continuation count

_

Patches currently in -mm which might be from [email protected] are