mm/filemap: use folio_next_index() for start

[PATCH v1] mm/filemap: use folio_next_index() for start

Posted by tanze 6 days, 18 hours ago

Use folio_next_index() instead of open-coding
folio->index + folio_nr_pages(folio) when updating @start in
filemap_get_folios_contig(), filemap_get_folios_tag(), and
filemap_get_folios_dirty().

Signed-off-by: tanze <tanze@kylinos.cn>
---
 mm/filemap.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/mm/filemap.c b/mm/filemap.c
index 4e636647100c..e233d4a003ce 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2283,8 +2283,7 @@ unsigned filemap_get_folios_contig(struct address_space *mapping,
 			goto put_folio;
 
 		if (!folio_batch_add(fbatch, folio)) {
-			nr = folio_nr_pages(folio);
-			*start = folio->index + nr;
+			*start = folio_next_index(folio);
 			goto out;
 		}
 		xas_advance(&xas, folio_next_index(folio) - 1);
@@ -2344,8 +2343,7 @@ unsigned filemap_get_folios_tag(struct address_space *mapping, pgoff_t *start,
 		if (xa_is_value(folio))
 			continue;
 		if (!folio_batch_add(fbatch, folio)) {
-			unsigned long nr = folio_nr_pages(folio);
-			*start = folio->index + nr;
+			*start = folio_next_index(folio);
 			goto out;
 		}
 	}
@@ -2403,8 +2401,7 @@ unsigned filemap_get_folios_dirty(struct address_space *mapping, pgoff_t *start,
 			}
 		}
 		if (!folio_batch_add(fbatch, folio)) {
-			unsigned long nr = folio_nr_pages(folio);
-			*start = folio->index + nr;
+			*start = folio_next_index(folio);
 			goto out;
 		}
 	}
-- 
2.43.0

Re: [PATCH v1] mm/filemap: use folio_next_index() for start

Posted by Matthew Wilcox 6 days, 11 hours ago

On Mon, Jun 01, 2026 at 07:04:23PM +0800, tanze wrote:
> Use folio_next_index() instead of open-coding
> folio->index + folio_nr_pages(folio) when updating @start in
> filemap_get_folios_contig(), filemap_get_folios_tag(), and
> filemap_get_folios_dirty().
> 
> Signed-off-by: tanze <tanze@kylinos.cn>

Thanks!

Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org>

Re: [PATCH v1] mm/filemap: use folio_next_index() for start

Posted by Jan Kara 6 days, 13 hours ago

On Mon 01-06-26 19:04:23, tanze wrote:
> Use folio_next_index() instead of open-coding
> folio->index + folio_nr_pages(folio) when updating @start in
> filemap_get_folios_contig(), filemap_get_folios_tag(), and
> filemap_get_folios_dirty().
> 
> Signed-off-by: tanze <tanze@kylinos.cn>

Looks good. Feel free to add:

Reviewed-by: Jan Kara <jack@suse.cz>

								Honza

> ---
>  mm/filemap.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/mm/filemap.c b/mm/filemap.c
> index 4e636647100c..e233d4a003ce 100644
> --- a/mm/filemap.c
> +++ b/mm/filemap.c
> @@ -2283,8 +2283,7 @@ unsigned filemap_get_folios_contig(struct address_space *mapping,
>  			goto put_folio;
>  
>  		if (!folio_batch_add(fbatch, folio)) {
> -			nr = folio_nr_pages(folio);
> -			*start = folio->index + nr;
> +			*start = folio_next_index(folio);
>  			goto out;
>  		}
>  		xas_advance(&xas, folio_next_index(folio) - 1);
> @@ -2344,8 +2343,7 @@ unsigned filemap_get_folios_tag(struct address_space *mapping, pgoff_t *start,
>  		if (xa_is_value(folio))
>  			continue;
>  		if (!folio_batch_add(fbatch, folio)) {
> -			unsigned long nr = folio_nr_pages(folio);
> -			*start = folio->index + nr;
> +			*start = folio_next_index(folio);
>  			goto out;
>  		}
>  	}
> @@ -2403,8 +2401,7 @@ unsigned filemap_get_folios_dirty(struct address_space *mapping, pgoff_t *start,
>  			}
>  		}
>  		if (!folio_batch_add(fbatch, folio)) {
> -			unsigned long nr = folio_nr_pages(folio);
> -			*start = folio->index + nr;
> +			*start = folio_next_index(folio);
>  			goto out;
>  		}
>  	}
> -- 
> 2.43.0
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR