Re: linux-next: build failure after merge of the folio tree

From: Gao Xiang <hsiangkao@linux.alibaba.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Matthew Wilcox <willy@infradead.org>,
	Gao Xiang <xiang@kernel.org>,
	Jeffle Xu <jefflexu@linux.alibaba.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the folio tree
Date: Mon, 2 May 2022 18:01:20 +0800	[thread overview]
Message-ID: <Ym+r8OK3eWUihmr6@B-P7TQMD6M-0146.local> (raw)
In-Reply-To: <20220502180425.7305c335@canb.auug.org.au>

Hi Stephen,

On Mon, May 02, 2022 at 06:04:25PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the folio tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> fs/erofs/fscache.c:255:10: error: 'const struct address_space_operations' has no member named 'readpage'
>   255 |         .readpage = erofs_fscache_meta_readpage,
>       |          ^~~~~~~~
> fs/erofs/fscache.c:255:21: error: initialization of 'int (*)(struct page *, struct writeback_control *)' from incompatible pointer type 'int (*)(struct file *, struct page *)' [-Werror=incompatible-pointer-types]
>   255 |         .readpage = erofs_fscache_meta_readpage,
>       |                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> fs/erofs/fscache.c:255:21: note: (near initialization for 'erofs_fscache_meta_aops.writepage')
> fs/erofs/fscache.c:259:10: error: 'const struct address_space_operations' has no member named 'readpage'
>   259 |         .readpage = erofs_fscache_readpage,
>       |          ^~~~~~~~
> fs/erofs/fscache.c:259:21: error: initialization of 'int (*)(struct page *, struct writeback_control *)' from incompatible pointer type 'int (*)(struct file *, struct page *)' [-Werror=incompatible-pointer-types]
>   259 |         .readpage = erofs_fscache_readpage,
>       |                     ^~~~~~~~~~~~~~~~~~~~~~
> fs/erofs/fscache.c:259:21: note: (near initialization for 'erofs_fscache_access_aops.writepage')
> 
> Caused by commit
> 
>   00da6d4b7219 ("mm,fs: Remove stray references to ->readpage")
> 
> interacting with commits
> 
>   60aa7e805f00 ("erofs: implement fscache-based metadata read")
>   e472f468adbe ("erofs: implement fscache-based data read for non-inline layout")
> 
> from the erofs tree.
> 
> I have applied the following merge fix patch.
> 

That looks good to me, will point out this conflict then.

Thanks,
Gao Xiang

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 2 May 2022 17:57:39 +1000
> Subject: [PATCH] fixup for "mm,fs: Remove stray references to ->readpage"
> 
> interacting with commits
> 
>   60aa7e805f00 ("erofs: implement fscache-based metadata read")
>   e472f468adbe ("erofs: implement fscache-based data read for non-inline layout")
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  fs/erofs/fscache.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c
> index a402d8f0a063..1bb2d0fc19c8 100644
> --- a/fs/erofs/fscache.c
> +++ b/fs/erofs/fscache.c
> @@ -59,10 +59,9 @@ static int erofs_fscache_read_folios(struct fscache_cookie *cookie,
>  	return ret;
>  }
>  
> -static int erofs_fscache_meta_readpage(struct file *data, struct page *page)
> +static int erofs_fscache_meta_read_folio(struct file *data, struct folio *folio)
>  {
>  	int ret;
> -	struct folio *folio = page_folio(page);
>  	struct super_block *sb = folio_mapping(folio)->host->i_sb;
>  	struct erofs_map_dev mdev = {
>  		.m_deviceid = 0,
> @@ -110,9 +109,8 @@ static int erofs_fscache_readpage_inline(struct folio *folio,
>  	return 0;
>  }
>  
> -static int erofs_fscache_readpage(struct file *file, struct page *page)
> +static int erofs_fscache_read_folio(struct file *file, struct folio *folio)
>  {
> -	struct folio *folio = page_folio(page);
>  	struct inode *inode = folio_mapping(folio)->host;
>  	struct super_block *sb = inode->i_sb;
>  	struct erofs_map_blocks map;
> @@ -252,11 +250,11 @@ static void erofs_fscache_readahead(struct readahead_control *rac)
>  }
>  
>  static const struct address_space_operations erofs_fscache_meta_aops = {
> -	.readpage = erofs_fscache_meta_readpage,
> +	.read_folio = erofs_fscache_meta_read_folio,
>  };
>  
>  const struct address_space_operations erofs_fscache_access_aops = {
> -	.readpage = erofs_fscache_readpage,
> +	.read_folio = erofs_fscache_read_folio,
>  	.readahead = erofs_fscache_readahead,
>  };
>  
> -- 
> 2.35.1
> 
> -- 
> Cheers,
> Stephen Rothwell