[028/262] mm/smaps: use vma->vm_pgoff directly when counting partial swap

Commit Message

Andrew Morton Nov. 5, 2021, 8:36 p.m. UTC

From: Peter Xu <[e-mail]>
Subject: mm/smaps: use vma->vm_pgoff directly when counting partial swap

As it's trying to cover the whole vma anyways, use direct vm_pgoff value
and vma_pages() rather than linear_page_index.

Link: https://lkml.kernel.org/r/[e-mail]
Signed-off-by: Peter Xu <[e-mail]>
Reviewed-by: Vlastimil Babka <[e-mail]>
Cc: Hugh Dickins <[e-mail]>
Cc: Andrea Arcangeli <[e-mail]>
Cc: Matthew Wilcox <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 mm/shmem.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Patch

--- a/mm/shmem.c~mm-smaps-use-vma-vm_pgoff-directly-when-counting-partial-swap
+++ a/mm/shmem.c
@@ -856,9 +856,8 @@  unsigned long shmem_swap_usage(struct vm
 		return swapped << PAGE_SHIFT;
 
 	/* Here comes the more involved part */
-	return shmem_partial_swap_usage(mapping,
-			linear_page_index(vma, vma->vm_start),
-			linear_page_index(vma, vma->vm_end));
+	return shmem_partial_swap_usage(mapping, vma->vm_pgoff,
+					vma->vm_pgoff + vma_pages(vma));
 }
 
 /*