mm-swap-fold-swap_info_get_cont-in-the-only-caller.patch removed from -mm tree
The quilt patch titled
Subject: mm, swap: fold swap_info_get_cont in the only caller
has been removed from the -mm tree. Its filename was
mm-swap-fold-swap_info_get_cont-in-the-only-caller.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: fold swap_info_get_cont in the only caller
Date: Tue, 14 Jan 2025 01:57:21 +0800
The name of the function is confusing, and the code is much easier to follow after folding, also rename the confusing naming "p" to more meaningful "si".
Signed-off-by Kairui Song <[email protected]>
Reviewed-by Baoquan He <[email protected]>
Cc Barry Song <[email protected]>
Cc Chis Li <[email protected]>
Cc "Huang, Ying" <[email protected]>
Cc Hugh Dickens <[email protected]>
Cc Johannes Weiner <[email protected]>
Cc Kalesh Singh <[email protected]>
Cc Nhat Pham <[email protected]>
Cc Ryan Roberts <[email protected]>
Cc Yosry Ahmed <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/swapfile.c | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-)
mm/swapfile.c renamed from mm/swapfile.c~mm-swap-fold-swap_info_get_cont-in-the-only-caller +15 -24
@@ -1375,22 +1375,6 @@ out:return NULL ; } -static struct swap_info_struct *swap_info_get_cont (swp_entry_t entry, -struct swap_info_struct *q) -{ -struct swap_info_struct *p; - - p =_swap_info_get (entry); - -if (p != q) { -if (q !=NULL ) -spin_unlock (&q->lock); -if (p !=NULL ) -spin_lock (&p->lock); - } -return p; -} -static unsigned char __swap_entry_free_locked (struct swap_info_struct *si,unsigned long offset,unsigned char usage)
@@ -1687,14 +1671,14 @@ static int swp_entry_cmp(const void *entvoid swapcache_free_entries (swp_entry_t *entries,int n) { -struct swap_info_struct *p, *prev; +struct swap_info_struct *si, *prev;int i;if (n <=0 )return ; prev =NULL ; - p =NULL ; + si =NULL ;/* * Sort swap entries by swap device, so each lock is only taken once.
@@ -1704,13 +1688,20 @@ void swapcache_free_entries(swp_entry_tif (nr_swapfiles >1 )sort (entries, n,sizeof (entries[0 ]), swp_entry_cmp,NULL );for (i =0 ; i < n; ++i) { - p =swap_info_get_cont (entries[i], prev); -if (p) -swap_entry_range_free (p, entries[i],1 ); - prev = p; + si =_swap_info_get (entries[i]); + +if (si != prev) { +if (prev !=NULL ) +spin_unlock (&prev->lock); +if (si !=NULL ) +spin_lock (&si->lock); + } +if (si) +swap_entry_range_free (si, entries[i],1 ); + prev = si; } -if (p) -spin_unlock (&p->lock); +if (si) +spin_unlock (&si->lock); }int __swap_count (swp_entry_t entry)
_
Patches currently in -mm which might be from [email protected] are