mm: swap: remove CLUSTER_FLAG_HUGE from swap_cluster_info:flags

[sfrench/cifs-2.6.git] / mm / swapfile.c

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 5e6d2304a2a47d6f2dca7b29410864f065dcf05c..1ded6d1dcab425ab191d2b658817f217597fe0d9 100644 (file)
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -343,18 +343,6 @@ static inline void cluster_set_null(struct swap_cluster_info *info)
        info->data = 0;
 }
 
-static inline bool cluster_is_huge(struct swap_cluster_info *info)
-{
-       if (IS_ENABLED(CONFIG_THP_SWAP))
-               return info->flags & CLUSTER_FLAG_HUGE;
-       return false;
-}
-
-static inline void cluster_clear_huge(struct swap_cluster_info *info)
-{
-       info->flags &= ~CLUSTER_FLAG_HUGE;
-}
-
 static inline struct swap_cluster_info *lock_cluster(struct swap_info_struct *si,
                                                     unsigned long offset)
 {
@@ -1027,7 +1015,7 @@ static int swap_alloc_cluster(struct swap_info_struct *si, swp_entry_t *slot)
        offset = idx * SWAPFILE_CLUSTER;
        ci = lock_cluster(si, offset);
        alloc_cluster(si, idx);
-       cluster_set_count_flag(ci, SWAPFILE_CLUSTER, CLUSTER_FLAG_HUGE);
+       cluster_set_count(ci, SWAPFILE_CLUSTER);
 
        memset(si->swap_map + offset, SWAP_HAS_CACHE, SWAPFILE_CLUSTER);
        unlock_cluster(ci);
@@ -1365,7 +1353,6 @@ void put_swap_folio(struct folio *folio, swp_entry_t entry)
 
        ci = lock_cluster_or_swap_info(si, offset);
        if (size == SWAPFILE_CLUSTER) {
-               VM_BUG_ON(!cluster_is_huge(ci));
                map = si->swap_map + offset;
                for (i = 0; i < SWAPFILE_CLUSTER; i++) {
                        val = map[i];
@@ -1373,7 +1360,6 @@ void put_swap_folio(struct folio *folio, swp_entry_t entry)
                        if (val == SWAP_HAS_CACHE)
                                free_entries++;
                }
-               cluster_clear_huge(ci);
                if (free_entries == SWAPFILE_CLUSTER) {
                        unlock_cluster_or_swap_info(si, ci);
                        spin_lock(&si->lock);
@@ -1395,23 +1381,6 @@ void put_swap_folio(struct folio *folio, swp_entry_t entry)
        unlock_cluster_or_swap_info(si, ci);
 }
 
-#ifdef CONFIG_THP_SWAP
-int split_swap_cluster(swp_entry_t entry)
-{
-       struct swap_info_struct *si;
-       struct swap_cluster_info *ci;
-       unsigned long offset = swp_offset(entry);
-
-       si = _swap_info_get(entry);
-       if (!si)
-               return -EBUSY;
-       ci = lock_cluster(si, offset);
-       cluster_clear_huge(ci);
-       unlock_cluster(ci);
-       return 0;
-}
-#endif
-
 static int swp_entry_cmp(const void *ent1, const void *ent2)
 {
        const swp_entry_t *e1 = ent1, *e2 = ent2;
@@ -1519,22 +1488,23 @@ out:
 }
 
 static bool swap_page_trans_huge_swapped(struct swap_info_struct *si,
-                                        swp_entry_t entry)
+                                        swp_entry_t entry, int order)
 {
        struct swap_cluster_info *ci;
        unsigned char *map = si->swap_map;
+       unsigned int nr_pages = 1 << order;
        unsigned long roffset = swp_offset(entry);
-       unsigned long offset = round_down(roffset, SWAPFILE_CLUSTER);
+       unsigned long offset = round_down(roffset, nr_pages);
        int i;
        bool ret = false;
 
        ci = lock_cluster_or_swap_info(si, offset);
-       if (!ci || !cluster_is_huge(ci)) {
+       if (!ci || nr_pages == 1) {
                if (swap_count(map[roffset]))
                        ret = true;
                goto unlock_out;
        }
-       for (i = 0; i < SWAPFILE_CLUSTER; i++) {
+       for (i = 0; i < nr_pages; i++) {
                if (swap_count(map[offset + i])) {
                        ret = true;
                        break;
@@ -1556,7 +1526,7 @@ static bool folio_swapped(struct folio *folio)
        if (!IS_ENABLED(CONFIG_THP_SWAP) || likely(!folio_test_large(folio)))
                return swap_swapcount(si, entry) != 0;
 
-       return swap_page_trans_huge_swapped(si, entry);
+       return swap_page_trans_huge_swapped(si, entry, folio_order(folio));
 }
 
 /**
@@ -1622,8 +1592,7 @@ int free_swap_and_cache(swp_entry_t entry)
                }
 
                count = __swap_entry_free(p, entry);
-               if (count == SWAP_HAS_CACHE &&
-                   !swap_page_trans_huge_swapped(p, entry))
+               if (count == SWAP_HAS_CACHE)
                        __try_to_reclaim_swap(p, swp_offset(entry),
                                              TTRS_UNMAPPED | TTRS_FULL);
                put_swap_device(p);