From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 030BCC433EF for ; Mon, 2 May 2022 10:01:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1384515AbiEBKFV (ORCPT ); Mon, 2 May 2022 06:05:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1384502AbiEBKFI (ORCPT ); Mon, 2 May 2022 06:05:08 -0400 Received: from out30-42.freemail.mail.aliyun.com (out30-42.freemail.mail.aliyun.com [115.124.30.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAF0363F8; Mon, 2 May 2022 03:01:24 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R371e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04394;MF=hsiangkao@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0VC-hchj_1651485680; Received: from B-P7TQMD6M-0146.local(mailfrom:hsiangkao@linux.alibaba.com fp:SMTPD_---0VC-hchj_1651485680) by smtp.aliyun-inc.com(127.0.0.1); Mon, 02 May 2022 18:01:22 +0800 Date: Mon, 2 May 2022 18:01:20 +0800 From: Gao Xiang To: Stephen Rothwell Cc: Matthew Wilcox , Gao Xiang , Jeffle Xu , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: build failure after merge of the folio tree Message-ID: References: <20220502180425.7305c335@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20220502180425.7305c335@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > 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 > --- > 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