From: Baoquan He <bhe@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org, akpm@linux-foundation.org, ryncsn@gmail.com,
chrisl@kernel.org, Baoquan He <bhe@redhat.com>
Subject: [PATCH 10/12] mm/swap: rename swap_swapcount() to swap_entry_swapped()
Date: Wed, 5 Feb 2025 17:27:19 +0800 [thread overview]
Message-ID: <20250205092721.9395-11-bhe@redhat.com> (raw)
In-Reply-To: <20250205092721.9395-1-bhe@redhat.com>
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().
Signed-off-by: Baoquan He <bhe@redhat.com>
---
include/linux/swap.h | 6 +++---
mm/swap_state.c | 2 +-
mm/swapfile.c | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 20bfedc8c4f2..395d41cf9676 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -500,7 +500,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;
@@ -583,9 +583,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 b393cefb3be0..3dba6eb164db 100644
--- 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 2a25ff5f31c8..93fd12c12bba 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1615,7 +1615,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;
@@ -1624,7 +1624,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;
}
/*
@@ -1710,7 +1710,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));
}
--
2.41.0
next prev parent reply other threads:[~2025-02-05 9:28 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-05 9:27 [PATCH 00/12] Tiny cleanup and improvements about SWAP code Baoquan He
2025-02-05 9:27 ` [PATCH 01/12] mm/swap_state.c: fix the obsolete code comment Baoquan He
2025-02-05 9:27 ` [PATCH 02/12] mm/swap_state.c: optimize the code in clear_shadow_from_swap_cache() Baoquan He
2025-02-05 9:27 ` [PATCH 03/12] mm/swap: remove SWAP_FLAG_PRIO_SHIFT Baoquan He
2025-02-05 9:27 ` [PATCH 04/12] mm/swap: skip scanning cluster range if it's empty cluster Baoquan He
2025-02-05 17:07 ` Kairui Song
2025-02-06 1:40 ` Baoquan He
2025-02-06 2:14 ` Kairui Song
2025-02-05 9:27 ` [PATCH 05/12] mm/swap: rename swap_is_has_cache() to swap_only_has_cache() Baoquan He
2025-02-05 9:27 ` [PATCH 06/12] mm/swapfile.c: update the code comment above swap_count_continued() Baoquan He
2025-02-06 7:50 ` Kairui Song
2025-02-07 2:46 ` Baoquan He
2025-02-07 2:50 ` [PATCH v2 " Baoquan He
2025-02-05 9:27 ` [PATCH 07/12] mm/swapfile.c: optimize code in setup_clusters() Baoquan He
2025-02-05 9:27 ` [PATCH 08/12] mm/swap_state.c: remove the meaningless code comment Baoquan He
2025-02-05 9:27 ` [PATCH 09/12] mm/swapfile.c: remove the unneeded checking Baoquan He
2025-02-05 9:27 ` Baoquan He [this message]
2025-02-05 9:27 ` [PATCH 11/12] mm/swapfile.c: remove the incorrect code comment Baoquan He
2025-02-05 9:27 ` [PATCH 12/12] mm/swapfile.c: open code cluster_alloc_swap() Baoquan He
2025-02-07 9:36 ` [PATCH 00/12] Tiny cleanup and improvements about SWAP code Kairui Song
2025-02-08 1:08 ` Baoquan He
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250205092721.9395-11-bhe@redhat.com \
--to=bhe@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=chrisl@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=ryncsn@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox