swap-remove-__swp_swapcount.patch removed from -mm tree
The quilt patch titled
Subject: swap: remove __swp_swapcount()
has been removed from the -mm tree. Its filename was
swap-remove-__swp_swapcount.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: Huang Ying <[email protected]>
Subject: swap: remove __swp_swapcount()
Date: Mon, 29 May 2023 14:13:53 +0800
__swp_swapcount() just encloses the calling to swap_swapcount() with get/put_swap_device(). It is called in __read_swap_cache_async() only, which encloses the calling with get/put_swap_device() already. So, __read_swap_cache_async() can call swap_swapcount() directly.
---
include/linux/swap.h | 4 ++-- mm/swap_state.c | 2 +- mm/swapfile.c | 20 +------------------- 3 files changed, 4 insertions(+), 22 deletions(-)
include/linux/swap.h renamed from include/linux/swap.h~swap-remove-__swp_swapcount +2 -2
@@ -513,7 +513,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 __swp_swapcount (swp_entry_t entry); +extern int swap_swapcount (struct swap_info_struct *si,swp_entry_t entry);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);
@@ -591,7 +591,7 @@ static inline int __swap_count(swp_entryreturn 0 ; } -static inline int __swp_swapcount (swp_entry_t entry) +static inline int swap_swapcount (struct swap_info_struct *si,swp_entry_t entry) {return 0 ; }
mm/swapfile.c renamed from mm/swapfile.c~swap-remove-__swp_swapcount +1 -19
@@ -1444,7 +1444,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. */ -static int swap_swapcount (struct swap_info_struct *si,swp_entry_t entry) +int swap_swapcount (struct swap_info_struct *si,swp_entry_t entry) {pgoff_t offset =swp_offset (entry);struct swap_cluster_info *ci;
@@ -1456,24 +1456,6 @@ static int swap_swapcount(struct swap_inreturn count; } -/* -* How many references to @entry are currently swapped out? -* 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 __swp_swapcount (swp_entry_t entry) -{ -int count =0 ; -struct swap_info_struct *si; - - si =get_swap_device (entry); -if (si) { - count =swap_swapcount (si, entry); -put_swap_device (si); - } -return count; -} -/* * How many references to @entry are currently swapped out? * This considers COUNT_CONTINUED so it returns exact answer.
mm/swap_state.c renamed from mm/swap_state.c~swap-remove-__swp_swapcount +1 -1
@@ -447,7 +447,7 @@ struct page *__read_swap_cache_async(swp* as SWAP_HAS_CACHE. That's done in later part of code or * else swap_off will be aborted if we return NULL. */ -if (!__swp_swapcount (entry) && swap_slot_cache_enabled) +if (!swap_swapcount (si, entry) && swap_slot_cache_enabled) goto fail_put_swap;/*
_
Patches currently in -mm which might be from [email protected] are