[RFC,68/79] mm/vma_address: convert page's index lookup to be against specific mapping

Commit Message

Jerome Glisse April 4, 2018, 7:18 p.m. UTC

From: Jérôme Glisse <[e-mail]>

Pass down the mapping ...

Signed-off-by: Jérôme Glisse <[e-mail]>
Cc: Andrew Morton <[e-mail]>
Cc: Mel Gorman <[e-mail]>
Cc: [e-mail]
Cc: Alexander Viro <[e-mail]>
Cc: [e-mail]
---
 mm/internal.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Patch

diff --git a/mm/internal.h b/mm/internal.h
index e6bd35182dae..43e9ed27362f 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -336,7 +336,9 @@  extern pmd_t maybe_pmd_mkwrite(pmd_t pmd, struct vm_area_struct *vma);
 static inline unsigned long
 __vma_address(struct page *page, struct vm_area_struct *vma)
 {
-	pgoff_t pgoff = page_to_pgoff(page);
+	struct address_space *mapping = vma->vm_file ? vma->vm_file->f_mapping : NULL;
+
+	pgoff_t pgoff = _page_to_pgoff(page, mapping);
 	return vma->vm_start + ((pgoff - vma->vm_pgoff) << PAGE_SHIFT);
 }