mm/swap: inline folio_set_swap_entry() and folio_swap_entry()

[linux-2.6-block.git] / mm / swap_state.c

diff --git a/mm/swap_state.c b/mm/swap_state.c
index 2f24178100520b080d781526aa660867a4e027eb..b3b14bd0dd6447f47aea2df42e8348f15660c73a 100644 (file)
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -100,7 +100,7 @@ int add_to_swap_cache(struct folio *folio, swp_entry_t entry,
 
        folio_ref_add(folio, nr);
        folio_set_swapcache(folio);
-       folio_set_swap_entry(folio, entry);
+       folio->swap = entry;
 
        do {
                xas_lock_irq(&xas);
@@ -156,8 +156,7 @@ void __delete_from_swap_cache(struct folio *folio,
                VM_BUG_ON_PAGE(entry != folio, entry);
                xas_next(&xas);
        }
-       entry.val = 0;
-       folio_set_swap_entry(folio, entry);
+       folio->swap.val = 0;
        folio_clear_swapcache(folio);
        address_space->nrpages -= nr;
        __node_stat_mod_folio(folio, NR_FILE_PAGES, -nr);
@@ -233,7 +232,7 @@ fail:
  */
 void delete_from_swap_cache(struct folio *folio)
 {
-       swp_entry_t entry = folio_swap_entry(folio);
+       swp_entry_t entry = folio->swap;
        struct address_space *address_space = swap_address_space(entry);
 
        xa_lock_irq(&address_space->i_pages);