From: Andrew Morton <akpm@linux-foundation.org>
To: mm-commits@vger.kernel.org, willy@infradead.org,
akpm@linux-foundation.org
Subject: [merged mm-stable] mm-remove-try_to_free_swap.patch removed from -mm tree
Date: Mon, 03 Oct 2022 14:05:30 -0700 [thread overview]
Message-ID: <20221003210531.38EE1C433D6@smtp.kernel.org> (raw)
The quilt patch titled
Subject: mm: remove try_to_free_swap()
has been removed from the -mm tree. Its filename was
mm-remove-try_to_free_swap.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 try_to_free_swap()
Date: Fri, 2 Sep 2022 20:46:44 +0100
All callers have now been converted to folio_free_swap() and we can remove
this wrapper.
Link: https://lkml.kernel.org/r/20220902194653.1739778-49-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
include/linux/swap.h | 6 ------
mm/folio-compat.c | 7 -------
mm/memory.c | 2 +-
3 files changed, 1 insertion(+), 14 deletions(-)
--- a/include/linux/swap.h~mm-remove-try_to_free_swap
+++ a/include/linux/swap.h
@@ -510,7 +510,6 @@ extern int __swp_swapcount(swp_entry_t e
extern int swp_swapcount(swp_entry_t entry);
extern struct swap_info_struct *page_swap_info(struct page *);
extern struct swap_info_struct *swp_swap_info(swp_entry_t entry);
-extern int try_to_free_swap(struct page *);
struct backing_dev_info;
extern int init_swap_address_space(unsigned int type, unsigned long nr_pages);
extern void exit_swap_address_space(unsigned int type);
@@ -594,11 +593,6 @@ static inline int swp_swapcount(swp_entr
{
return 0;
}
-
-static inline int try_to_free_swap(struct page *page)
-{
- return 0;
-}
static inline swp_entry_t folio_alloc_swap(struct folio *folio)
{
--- a/mm/folio-compat.c~mm-remove-try_to_free_swap
+++ a/mm/folio-compat.c
@@ -146,10 +146,3 @@ void putback_lru_page(struct page *page)
{
folio_putback_lru(page_folio(page));
}
-
-#ifdef CONFIG_SWAP
-int try_to_free_swap(struct page *page)
-{
- return folio_free_swap(page_folio(page));
-}
-#endif
--- a/mm/memory.c~mm-remove-try_to_free_swap
+++ a/mm/memory.c
@@ -3844,7 +3844,7 @@ vm_fault_t do_swap_page(struct vm_fault
if (swapcache) {
/*
- * Make sure try_to_free_swap or swapoff did not release the
+ * Make sure folio_free_swap() or swapoff did not release the
* swapcache from under us. The page pin, and pte_same test
* below, are not enough to exclude that. Even if it is still
* swapcache, we need to check that the page's swap has not
_
Patches currently in -mm which might be from willy@infradead.org are
reply other threads:[~2022-10-03 21:08 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221003210531.38EE1C433D6@smtp.kernel.org \
--to=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mm-commits@vger.kernel.org \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.