[merged mm-stable] mm-remove-lookup_swap_cache.patch removed from -mm tree

[merged mm-stable] mm-remove-lookup_swap_cache.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: mm: remove lookup_swap_cache()
has been removed from the -mm tree.  Its filename was
     mm-remove-lookup_swap_cache.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: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Subject: mm: remove lookup_swap_cache()
Date: Fri, 2 Sep 2022 20:46:34 +0100

All callers have now been converted to swap_cache_get_folio(), so we can
remove this wrapper.

Link: https://lkml.kernel.org/r/20220902194653.1739778-39-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/memcontrol.c |    2 +-
 mm/swap.h       |   10 ----------
 mm/swap_state.c |   12 +-----------
 3 files changed, 2 insertions(+), 22 deletions(-)

--- a/mm/memcontrol.c~mm-remove-lookup_swap_cache
+++ a/mm/memcontrol.c
@@ -5569,7 +5569,7 @@ static struct page *mc_handle_swap_pte(s
 		return NULL;
 
 	/*
-	 * Because lookup_swap_cache() updates some statistics counter,
+	 * Because swap_cache_get_folio() updates some statistics counter,
 	 * we call find_get_page() with swapper_space directly.
 	 */
 	page = find_get_page(swap_address_space(ent), swp_offset(ent));
--- a/mm/swap.h~mm-remove-lookup_swap_cache
+++ a/mm/swap.h
@@ -41,9 +41,6 @@ void clear_shadow_from_swap_cache(int ty
 				  unsigned long end);
 struct folio *swap_cache_get_folio(swp_entry_t entry,
 		struct vm_area_struct *vma, unsigned long addr);
-struct page *lookup_swap_cache(swp_entry_t entry,
-			       struct vm_area_struct *vma,
-			       unsigned long addr);
 struct page *find_get_incore_page(struct address_space *mapping, pgoff_t index);
 
 struct page *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
@@ -106,13 +103,6 @@ static inline struct folio *swap_cache_g
 {
 	return NULL;
 }
-
-static inline struct page *lookup_swap_cache(swp_entry_t swp,
-					     struct vm_area_struct *vma,
-					     unsigned long addr)
-{
-	return NULL;
-}
 
 static inline
 struct page *find_get_incore_page(struct address_space *mapping, pgoff_t index)
--- a/mm/swap_state.c~mm-remove-lookup_swap_cache
+++ a/mm/swap_state.c
@@ -369,16 +369,6 @@ struct folio *swap_cache_get_folio(swp_e
 	return folio;
 }
 
-struct page *lookup_swap_cache(swp_entry_t entry, struct vm_area_struct *vma,
-			       unsigned long addr)
-{
-	struct folio *folio = swap_cache_get_folio(entry, vma, addr);
-
-	if (!folio)
-		return NULL;
-	return folio_file_page(folio, swp_offset(entry));
-}
-
 /**
  * find_get_incore_page - Find and get a page from the page or swap caches.
  * @mapping: The address_space to search.
@@ -430,7 +420,7 @@ struct page *__read_swap_cache_async(swp
 		int err;
 		/*
 		 * First check the swap cache.  Since this is normally
-		 * called after lookup_swap_cache() failed, re-calling
+		 * called after swap_cache_get_folio() failed, re-calling
 		 * that would confuse statistics.
 		 */
 		si = get_swap_device(entry);
_

Patches currently in -mm which might be from willy@infradead.org are