mm: use page_pgoff() in more places

There are several places which currently open-code page_pgoff(), convert
them to call it.

Link: https://lkml.kernel.org/r/20241005200121.3231142-3-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/kernel/futex/core.c b/kernel/futex/core.c
index 136768ae26375fafcebf8815ae965f13a3161adf..342dc4dd328b6abf0cc220b9162e1bbe52235581 100644 (file)
--- a/kernel/futex/core.c
+++ b/kernel/futex/core.c
@@ -399,7 +399,7 @@ again:
 
                key->both.offset |= FUT_OFF_INODE; /* inode-based key */
                key->shared.i_seq = get_inode_sequence_number(inode);
-               key->shared.pgoff = folio->index + folio_page_idx(folio, page);
+               key->shared.pgoff = page_pgoff(folio, page);
                rcu_read_unlock();
        }
 

diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c
index ab1671e71cb2dfdc5d45747dbe50d992d4dacfb6..6b356853c04e40cf586d1b347aec2c5efd81bab1 100644 (file)
--- a/mm/page_vma_mapped.c
+++ b/mm/page_vma_mapped.c
@@ -340,7 +340,6 @@ next_pte:
 unsigned long page_mapped_in_vma(struct page *page, struct vm_area_struct *vma)
 {
        struct folio *folio = page_folio(page);
-       pgoff_t pgoff = folio->index + folio_page_idx(folio, page);
        struct page_vma_mapped_walk pvmw = {
                .pfn = page_to_pfn(page),
                .nr_pages = 1,
@@ -348,7 +347,7 @@ unsigned long page_mapped_in_vma(struct page *page, struct vm_area_struct *vma)
                .flags = PVMW_SYNC,
        };
 
-       pvmw.address = vma_address(vma, pgoff, 1);
+       pvmw.address = vma_address(vma, page_pgoff(folio, page), 1);
        if (pvmw.address == -EFAULT)
                goto out;
        if (!page_vma_mapped_walk(&pvmw))

diff --git a/mm/rmap.c b/mm/rmap.c
index 013f91d932248c52673c171cb16669cbe92130d8..4d9de8ad51aba992291191ea72ea24a475e84a3c 100644 (file)
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -775,7 +775,6 @@ static bool should_defer_flush(struct mm_struct *mm, enum ttu_flags flags)
 unsigned long page_address_in_vma(struct page *page, struct vm_area_struct *vma)
 {
        struct folio *folio = page_folio(page);
-       pgoff_t pgoff;
 
        if (folio_test_anon(folio)) {
                struct anon_vma *page__anon_vma = folio_anon_vma(folio);
@@ -793,8 +792,7 @@ unsigned long page_address_in_vma(struct page *page, struct vm_area_struct *vma)
        }
 
        /* The !page__anon_vma above handles KSM folios */
-       pgoff = folio->index + folio_page_idx(folio, page);
-       return vma_address(vma, pgoff, 1);
+       return vma_address(vma, page_pgoff(folio, page), 1);
 }
 
 /*