mm/swap: rename swap_swapcount() to swap_entry_swapped()

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().

Link: https://lkml.kernel.org/r/20250205092721.9395-11-bhe@redhat.com
Signed-off-by: Baoquan He <bhe@redhat.com>
Cc: Chris Li <chrisl@kernel.org>
Cc: Kairui Song <ryncsn@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/swap.h b/include/linux/swap.h
index bbd06cbd1f2ba08328742bc776ee80e3a22241ab..2fe91c293636b6bee8022ab3066ffbb42916585f 100644 (file)
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -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_entry_t entry)
        return 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)

diff --git a/mm/swap_state.c b/mm/swap_state.c
index 718a8de0c07d3fdf4d2a337d0dbe752ca007c539..a54b035d6a6cc532dad46e9d12a4682a0d92d958 100644 (file)
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -457,7 +457,7 @@ struct folio *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
                 * 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;
 
                /*

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 45d25f17066084b685facb839daefcbed7a376de..d45349ed3ee10c5c600983fec1d9ca68c4300f80 100644 (file)
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -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_struct *si, swp_entry_t entry)
        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 *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));
 }