Re: [PATCH 22/27] f2fs: Add f2fs_get_lock_data_folio()

[Chao Yu <chao@kernel.org>]

On 2025/2/18 13:51, Matthew Wilcox (Oracle) wrote:
> Convert f2fs_get_lock_data_page() to f2fs_get_lock_data_folio() and
> add a compatibility wrapper.  Removes three hidden calls to
> compound_head().
> 
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
> ---
>   fs/f2fs/data.c | 18 +++++++++---------
>   fs/f2fs/f2fs.h | 10 +++++++++-
>   2 files changed, 18 insertions(+), 10 deletions(-)
> 
> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> index f0747c7f669d..e891c95bc525 100644
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@ -1310,23 +1310,23 @@ struct page *f2fs_find_data_page(struct inode *inode, pgoff_t index,
>    * Because, the callers, functions in dir.c and GC, should be able to know
>    * whether this page exists or not.
>    */
> -struct page *f2fs_get_lock_data_page(struct inode *inode, pgoff_t index,
> +struct folio *f2fs_get_lock_data_folio(struct inode *inode, pgoff_t index,
>   							bool for_write)
>   {
>   	struct address_space *mapping = inode->i_mapping;
> -	struct page *page;
> +	struct folio *folio;
>   
> -	page = f2fs_get_read_data_page(inode, index, 0, for_write, NULL);
> -	if (IS_ERR(page))
> -		return page;
> +	folio = f2fs_get_read_data_folio(inode, index, 0, for_write, NULL);
> +	if (IS_ERR(folio))
> +		return folio;
>   
>   	/* wait for read completion */
> -	lock_page(page);
> -	if (unlikely(page->mapping != mapping || !PageUptodate(page))) {
> -		f2fs_put_page(page, 1);
> +	folio_lock(folio);
> +	if (unlikely(folio->mapping != mapping || !folio_test_uptodate(folio))) {
> +		f2fs_folio_put(folio, true);
>   		return ERR_PTR(-EIO);
>   	}
> -	return page;
> +	return folio;
>   }
>   
>   /*
> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> index 3e02df63499e..c78ba3c7d642 100644
> --- a/fs/f2fs/f2fs.h
> +++ b/fs/f2fs/f2fs.h
> @@ -3899,7 +3899,7 @@ struct folio *f2fs_get_read_data_folio(struct inode *inode, pgoff_t index,
>   		blk_opf_t op_flags, bool for_write, pgoff_t *next_pgofs);
>   struct page *f2fs_find_data_page(struct inode *inode, pgoff_t index,
>   							pgoff_t *next_pgofs);
> -struct page *f2fs_get_lock_data_page(struct inode *inode, pgoff_t index,
> +struct folio *f2fs_get_lock_data_folio(struct inode *inode, pgoff_t index,
>   			bool for_write);
>   struct page *f2fs_get_new_data_page(struct inode *inode,
>   			struct page *ipage, pgoff_t index, bool new_i_size);
> @@ -3936,6 +3936,14 @@ static inline struct page *f2fs_get_read_data_page(struct inode *inode,
>   	return &folio->page;
>   }
>   
> +static inline struct page *f2fs_get_lock_data_page(struct inode *inode,
> +		pgoff_t index, bool for_write)
> +{
> +	struct folio *folio = f2fs_get_lock_data_folio(inode, index, for_write);

	if (IS_ERR(folio))
		return ERR_CAST(folio));

> +
> +	return &folio->page;
> +}
> +
>   /*
>    * gc.c
>    */