]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
mm/swap: rename swap_is_has_cache() to swap_only_has_cache()
authorBaoquan He <bhe@redhat.com>
Wed, 5 Feb 2025 09:27:14 +0000 (17:27 +0800)
committerAndrew Morton <akpm@linux-foundation.org>
Mon, 17 Mar 2025 05:06:06 +0000 (22:06 -0700)
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.

Link: https://lkml.kernel.org/r/20250205092721.9395-6-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>
mm/swapfile.c

index 0a0c4118759e4c391ddf30991353a6d12dad59be..0a9c1efeffd6a3667496c757adbd86e99e875402 100644 (file)
@@ -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;
@@ -1577,7 +1577,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++) {