mm-swap-rename-swap_swapcount-to-swap_entry_swapped.patch removed from -mm tree
The quilt patch titled
Subject: mm/swap: rename swap_swapcount() to swap_entry_swapped()
has been removed from the -mm tree. Its filename was
mm-swap-rename-swap_swapcount-to-swap_entry_swapped.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_swapcount() to swap_entry_swapped()
Date: Wed, 5 Feb 2025 17:27:19 +0800
The new function name can reflect the real behaviour of the function more clearly and more accurately. And the renaming avoids the confusion between swap_swapcount() and swp_swapcount().
---
include/linux/swap.h | 6 +++--- mm/swap_state.c | 2 +- mm/swapfile.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-)
include/linux/swap.h renamed from include/linux/swap.h~mm-swap-rename-swap_swapcount-to-swap_entry_swapped +3 -3
@@ -499,7 +499,7 @@ int find_first_swap(dev_t *device);extern unsigned int count_swap_pages (int ,int );extern sector_t swapdev_block (int ,pgoff_t );extern int __swap_count (swp_entry_t entry); -extern int swap_swapcount (struct swap_info_struct *si,swp_entry_t entry); +extern bool swap_entry_swapped (struct swap_info_struct *si,swp_entry_t entry);extern int swp_swapcount (swp_entry_t entry);struct swap_info_struct *swp_swap_info (swp_entry_t entry);struct backing_dev_info ;
@@ -582,9 +582,9 @@ static inline int __swap_count(swp_entryreturn 0 ; } -static inline int swap_swapcount (struct swap_info_struct *si,swp_entry_t entry) +static inline bool swap_entry_swapped (struct swap_info_struct *si,swp_entry_t entry) { -return 0 ; +return false; }static inline int swp_swapcount (swp_entry_t entry)
mm/swapfile.c renamed from mm/swapfile.c~mm-swap-rename-swap_swapcount-to-swap_entry_swapped +3 -3
@@ -1620,7 +1620,7 @@ int __swap_count(swp_entry_t entry)* This does not give an exact answer when swap count is continued, * but does include the high COUNT_CONTINUED flag to allow for that. */ -int swap_swapcount (struct swap_info_struct *si,swp_entry_t entry) +bool swap_entry_swapped (struct swap_info_struct *si,swp_entry_t entry) {pgoff_t offset =swp_offset (entry);struct swap_cluster_info *ci;
@@ -1629,7 +1629,7 @@ int swap_swapcount(struct swap_info_stru ci =lock_cluster (si, offset); count =swap_count (si->swap_map[offset]);unlock_cluster (ci); -return count; +return !!count; }/*
@@ -1715,7 +1715,7 @@ static bool folio_swapped(struct folio *return false;if (!IS_ENABLED (CONFIG_THP_SWAP ) ||likely (!folio_test_large (folio))) -return swap_swapcount (si, entry) !=0 ; +return swap_entry_swapped (si, entry);return swap_page_trans_huge_swapped (si, entry,folio_order (folio)); }
mm/swap_state.c renamed from mm/swap_state.c~mm-swap-rename-swap_swapcount-to-swap_entry_swapped +1 -1
@@ -457,7 +457,7 @@ struct folio *__read_swap_cache_async(sw* as SWAP_HAS_CACHE. That's done in later part of code or * else swap_off will be aborted if we return NULL. */ -if (!swap_swapcount (si, entry) && swap_slot_cache_enabled) +if (!swap_entry_swapped (si, entry) && swap_slot_cache_enabled) goto put_and_return;/*
_
Patches currently in -mm which might be from [email protected] are