mm-swap-rename-swap_is_has_cache-to-swap_only_has_cache.patch removed from -mm tree
The quilt patch titled
Subject: mm/swap: rename swap_is_has_cache() to swap_only_has_cache()
has been removed from the -mm tree. Its filename was
mm-swap-rename-swap_is_has_cache-to-swap_only_has_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: Baoquan He <[email protected]>
Subject: mm/swap: rename swap_is_has_cache() to swap_only_has_cache()
Date: Wed, 5 Feb 2025 17:27:14 +0800
There are two predicates in the name of swap_is_has_cache() which is confusing. Renaming it to remove the confusion and can better reflect its functionality.
---
mm/swapfile.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
mm/swapfile.c renamed from mm/swapfile.c~mm-swap-rename-swap_is_has_cache-to-swap_only_has_cache +3 -3
@@ -161,7 +161,7 @@ static long swap_usage_in_pages(struct s/* Reclaim directly, bypass the slot cache and don't touch device lock */ #define TTRS_DIRECT 0x8 -static bool swap_is_has_cache (struct swap_info_struct *si, +static bool swap_only_has_cache (struct swap_info_struct *si,unsigned long offset,int nr_pages) {unsigned char *map = si->swap_map + offset;
@@ -243,7 +243,7 @@ static int __try_to_reclaim_swap(struct* reference or pending writeback, and can't be allocated to others. */ ci =lock_cluster (si, offset); - need_reclaim =swap_is_has_cache (si, offset, nr_pages); + need_reclaim =swap_only_has_cache (si, offset, nr_pages);unlock_cluster (ci);if (!need_reclaim) goto out_unlock;
@@ -1577,7 +1577,7 @@ void put_swap_folio(struct folio *folio,return ; ci =lock_cluster (si, offset); -if (swap_is_has_cache (si, offset, size)) +if (swap_only_has_cache (si, offset, size))swap_entry_range_free (si, ci, entry, size);else {for (int i =0 ; i < size; i++, entry.val++) {
_
Patches currently in -mm which might be from [email protected] are