From: Minjie Du Date: Thu, 21 Sep 2023 08:15:35 +0000 (+0800) Subject: mm/filemap: increase usage of folio_next_index() helper X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d98388cef5315d0235fdcad26600102f54966927;p=linux.git mm/filemap: increase usage of folio_next_index() helper Simplify code pattern of 'folio->index + folio_nr_pages(folio)' by using the existing helper folio_next_index() in filemap_map_pages(). Link: https://lkml.kernel.org/r/20230921081535.3398-1-duminjie@vivo.com Signed-off-by: Minjie Du Reviewed-by: Matthew Wilcox (Oracle) Reviewed-by: Yin Fengwei Signed-off-by: Andrew Morton --- diff --git a/mm/filemap.c b/mm/filemap.c index f0a15ce1bd1ba..9481ffaf24e6e 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3591,7 +3591,7 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf, addr += (xas.xa_index - last_pgoff) << PAGE_SHIFT; vmf->pte += xas.xa_index - last_pgoff; last_pgoff = xas.xa_index; - end = folio->index + folio_nr_pages(folio) - 1; + end = folio_next_index(folio) - 1; nr_pages = min(end, end_pgoff) - xas.xa_index + 1; if (!folio_test_large(folio))