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 05/12] mm/swap: rename swap_is_has_cache() to swap_only_has_cache()
Date: Wed, 5 Feb 2025 17:27:14 +0800 [thread overview]
Message-ID: <20250205092721.9395-6-bhe@redhat.com> (raw)
In-Reply-To: <20250205092721.9395-1-bhe@redhat.com>
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.
Signed-off-by: Baoquan He <bhe@redhat.com>
---
mm/swapfile.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 61efde853eea..bf284ba16198 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -161,7 +161,7 @@ static long swap_usage_in_pages(struct swap_info_struct *si)
/* 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 swap_info_struct *si,
* 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;
@@ -1572,7 +1572,7 @@ void put_swap_folio(struct folio *folio, swp_entry_t entry)
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++) {
--
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 ` Baoquan He [this message]
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 ` [PATCH 10/12] mm/swap: rename swap_swapcount() to swap_entry_swapped() Baoquan He
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-6-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