| Message ID | 20230919045135.3635437-12-willy@infradead.org |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | Finish the create_empty_buffers() transition | expand |
Hi, On Tue, Sep 19, 2023 at 1:56 PM Matthew Wilcox (Oracle) wrote: > > Both callers already have a folio, so pass it in and use it directly. > Removes a lot of hidden calls to compound_head(). > > Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> > --- > fs/nilfs2/page.c | 50 +++++++++++++++++++++++++----------------------- > 1 file changed, 26 insertions(+), 24 deletions(-) > > diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c > index 1c075bd906c9..696215d899bf 100644 > --- a/fs/nilfs2/page.c > +++ b/fs/nilfs2/page.c > @@ -184,30 +184,32 @@ void nilfs_page_bug(struct page *page) > } > > /** > - * nilfs_copy_page -- copy the page with buffers > - * @dst: destination page > - * @src: source page > - * @copy_dirty: flag whether to copy dirty states on the page's buffer heads. > + * nilfs_copy_folio -- copy the folio with buffers > + * @dst: destination folio > + * @src: source folio > + * @copy_dirty: flag whether to copy dirty states on the folio's buffer heads. > * > - * This function is for both data pages and btnode pages. The dirty flag > - * should be treated by caller. The page must not be under i/o. > - * Both src and dst page must be locked > + * This function is for both data folios and btnode folios. The dirty flag > + * should be treated by caller. The folio must not be under i/o. > + * Both src and dst folio must be locked > */ > -static void nilfs_copy_page(struct page *dst, struct page *src, int copy_dirty) > +static void nilfs_copy_folio(struct folio *dst, struct folio *src, > + bool copy_dirty) > { > struct buffer_head *dbh, *dbufs, *sbh; > unsigned long mask = NILFS_BUFFER_INHERENT_BITS; > > - BUG_ON(PageWriteback(dst)); > + BUG_ON(folio_test_writeback(dst)); > > - sbh = page_buffers(src); > - if (!page_has_buffers(dst)) > - create_empty_buffers(dst, sbh->b_size, 0); > + sbh = folio_buffers(src); > + dbh = folio_buffers(dst); > + if (!dbh) > + dbh = folio_create_empty_buffers(dst, sbh->b_size, 0); > > if (copy_dirty) > mask |= BIT(BH_Dirty); > > - dbh = dbufs = page_buffers(dst); > + dbufs = dbh; > do { > lock_buffer(sbh); > lock_buffer(dbh); > @@ -218,16 +220,16 @@ static void nilfs_copy_page(struct page *dst, struct page *src, int copy_dirty) > dbh = dbh->b_this_page; > } while (dbh != dbufs); > > - copy_highpage(dst, src); > + folio_copy(dst, src); > > - if (PageUptodate(src) && !PageUptodate(dst)) > - SetPageUptodate(dst); > - else if (!PageUptodate(src) && PageUptodate(dst)) > - ClearPageUptodate(dst); > - if (PageMappedToDisk(src) && !PageMappedToDisk(dst)) > - SetPageMappedToDisk(dst); > - else if (!PageMappedToDisk(src) && PageMappedToDisk(dst)) > - ClearPageMappedToDisk(dst); > + if (folio_test_uptodate(src) && !folio_test_uptodate(dst)) > + folio_mark_uptodate(dst); > + else if (!folio_test_uptodate(src) && folio_test_uptodate(dst)) > + folio_clear_uptodate(dst); > + if (folio_test_mappedtodisk(src) && !folio_test_mappedtodisk(dst)) > + folio_set_mappedtodisk(dst); > + else if (!folio_test_mappedtodisk(src) && folio_test_mappedtodisk(dst)) > + folio_clear_mappedtodisk(dst); > > do { > unlock_buffer(sbh); > @@ -269,7 +271,7 @@ int nilfs_copy_dirty_pages(struct address_space *dmap, > NILFS_PAGE_BUG(&folio->page, > "found empty page in dat page cache"); > > - nilfs_copy_page(&dfolio->page, &folio->page, 1); > + nilfs_copy_folio(dfolio, folio, true); > filemap_dirty_folio(folio_mapping(dfolio), dfolio); > > folio_unlock(dfolio); > @@ -314,7 +316,7 @@ void nilfs_copy_back_pages(struct address_space *dmap, > if (!IS_ERR(dfolio)) { > /* overwrite existing folio in the destination cache */ > WARN_ON(folio_test_dirty(dfolio)); > - nilfs_copy_page(&dfolio->page, &folio->page, 0); > + nilfs_copy_folio(dfolio, folio, false); > folio_unlock(dfolio); > folio_put(dfolio); > /* Do we not need to remove folio from smap here? */ > -- > 2.40.1 When I tried to test the patchset against 6.6-rc2, I encountered the following error during the build: ERROR: modpost: "folio_copy" [fs/nilfs2/nilfs2.ko] undefined! It looks like "folio_copy" is not exported to modules. I'll correct this manually for now and proceed with the review and testing, but could you please fix this build issue in some way ? Thanks, Ryusuke Konishi
On Tue, Sep 19, 2023 at 10:01:27PM +0900, Ryusuke Konishi wrote: > When I tried to test the patchset against 6.6-rc2, I encountered the > following error during the build: > > ERROR: modpost: "folio_copy" [fs/nilfs2/nilfs2.ko] undefined! > > It looks like "folio_copy" is not exported to modules. > > I'll correct this manually for now and proceed with the review and > testing, but could you please fix this build issue in some way ? Thanks! I'll export the symbol. I did build nilfs2 as a module, but I just did it with "make fs/" which doesn't run modpost. Appreciate the testing.
Hi Matthew,
kernel test robot noticed the following build errors:
[auto build test ERROR on next-20230918]
[also build test ERROR on v6.6-rc2]
[cannot apply to konis-nilfs2/upstream gfs2/for-next tytso-ext4/dev linus/master v6.6-rc2 v6.6-rc1 v6.5]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Matthew-Wilcox-Oracle/buffer-Make-folio_create_empty_buffers-return-a-buffer_head/20230919-125330
base: next-20230918
patch link: https://lore.kernel.org/r/20230919045135.3635437-12-willy%40infradead.org
patch subject: [PATCH 11/26] nilfs2: Convert nilfs_copy_page() to nilfs_copy_folio()
config: s390-defconfig (https://download.01.org/0day-ci/archive/20230920/202309200252.NpD8SUsn-lkp@intel.com/config)
compiler: s390-linux-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20230920/202309200252.NpD8SUsn-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202309200252.NpD8SUsn-lkp@intel.com/
All errors (new ones prefixed by >>, old ones prefixed by <<):
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/net/amt.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/net/macvtap.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/net/tap.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/net/ppp/ppp_generic.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/net/ppp/ppp_async.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/net/ppp/bsd_comp.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/net/ppp/ppp_deflate.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/net/ppp/ppp_synctty.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/net/slip/slhc.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/cdrom/cdrom.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/s390/cio/vfio_ccw.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/s390/block/dcssblk.o
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/s390/net/lcs.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/802/garp.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sched/act_gate.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sched/sch_htb.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sched/sch_hfsc.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sched/sch_red.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sched/sch_gred.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sched/sch_ingress.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sched/sch_sfq.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sched/sch_tbf.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sched/sch_teql.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sched/sch_prio.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sched/sch_multiq.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sched/sch_netem.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sched/sch_drr.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sched/sch_plug.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sched/sch_ets.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sched/sch_mqprio.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sched/sch_mqprio_lib.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sched/sch_choke.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sched/sch_qfq.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sched/cls_u32.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sched/cls_route.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sched/cls_fw.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sched/cls_basic.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/netlink/netlink_diag.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/netfilter/nfnetlink_osf.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/netfilter/nf_conntrack.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/netfilter/nf_conntrack_netlink.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/netfilter/nf_conntrack_broadcast.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/netfilter/nf_nat.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/netfilter/nf_tables.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/netfilter/nft_fib.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/netfilter/nft_chain_nat.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/netfilter/ipvs/ip_vs.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/netfilter/ipvs/ip_vs_rr.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/netfilter/ipvs/ip_vs_wrr.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/netfilter/ipvs/ip_vs_lc.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/netfilter/ipvs/ip_vs_wlc.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/netfilter/ipvs/ip_vs_lblc.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/netfilter/ipvs/ip_vs_lblcr.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/netfilter/ipvs/ip_vs_dh.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/netfilter/ipvs/ip_vs_sh.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/netfilter/ipvs/ip_vs_sed.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/netfilter/ipvs/ip_vs_nq.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/netfilter/ipvs/ip_vs_twos.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/netfilter/ipvs/ip_vs_ftp.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/netfilter/ipvs/ip_vs_pe_sip.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv4/netfilter/nf_defrag_ipv4.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv4/netfilter/nf_reject_ipv4.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv4/netfilter/iptable_nat.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv4/netfilter/iptable_raw.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv4/ip_tunnel.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv4/ipip.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv4/ip_gre.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv4/udp_tunnel.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv4/ip_vti.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv4/ah4.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv4/esp4.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv4/xfrm4_tunnel.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv4/tunnel4.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv4/inet_diag.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv4/tcp_diag.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv4/udp_diag.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/xfrm/xfrm_algo.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/xfrm/xfrm_user.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/unix/unix_diag.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv6/netfilter/ip6table_raw.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv6/netfilter/ip6table_nat.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv6/netfilter/nf_defrag_ipv6.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv6/netfilter/nf_reject_ipv6.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv6/ah6.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv6/esp6.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv6/xfrm6_tunnel.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv6/tunnel6.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv6/mip6.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv6/sit.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/ipv6/ip6_udp_tunnel.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/packet/af_packet_diag.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/8021q/8021q.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/mptcp/mptcp_diag.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/key/af_key.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sunrpc/sunrpc.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sunrpc/auth_gss/auth_rpcgss.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sunrpc/auth_gss/rpcsec_gss_krb5.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/sctp/sctp_diag.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/smc/smc_diag.o
WARNING: modpost: missing MODULE_DESCRIPTION() in net/vmw_vsock/vsock_diag.o
>> ERROR: modpost: "folio_copy" [fs/nilfs2/nilfs2.ko] undefined!
On Tue, Sep 19, 2023 at 1:56 PM Matthew Wilcox (Oracle) wrote: > > Both callers already have a folio, so pass it in and use it directly. > Removes a lot of hidden calls to compound_head(). > > Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> > --- > fs/nilfs2/page.c | 50 +++++++++++++++++++++++++----------------------- > 1 file changed, 26 insertions(+), 24 deletions(-) > > diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c > index 1c075bd906c9..696215d899bf 100644 > --- a/fs/nilfs2/page.c > +++ b/fs/nilfs2/page.c > @@ -184,30 +184,32 @@ void nilfs_page_bug(struct page *page) > } > > /** > - * nilfs_copy_page -- copy the page with buffers > - * @dst: destination page > - * @src: source page > - * @copy_dirty: flag whether to copy dirty states on the page's buffer heads. > + * nilfs_copy_folio -- copy the folio with buffers > + * @dst: destination folio > + * @src: source folio > + * @copy_dirty: flag whether to copy dirty states on the folio's buffer heads. > * > - * This function is for both data pages and btnode pages. The dirty flag > - * should be treated by caller. The page must not be under i/o. > - * Both src and dst page must be locked > + * This function is for both data folios and btnode folios. The dirty flag > + * should be treated by caller. The folio must not be under i/o. > + * Both src and dst folio must be locked > */ > -static void nilfs_copy_page(struct page *dst, struct page *src, int copy_dirty) > +static void nilfs_copy_folio(struct folio *dst, struct folio *src, > + bool copy_dirty) > { > struct buffer_head *dbh, *dbufs, *sbh; > unsigned long mask = NILFS_BUFFER_INHERENT_BITS; > > - BUG_ON(PageWriteback(dst)); > + BUG_ON(folio_test_writeback(dst)); > > - sbh = page_buffers(src); > - if (!page_has_buffers(dst)) > - create_empty_buffers(dst, sbh->b_size, 0); > + sbh = folio_buffers(src); > + dbh = folio_buffers(dst); > + if (!dbh) > + dbh = folio_create_empty_buffers(dst, sbh->b_size, 0); > > if (copy_dirty) > mask |= BIT(BH_Dirty); > > - dbh = dbufs = page_buffers(dst); > + dbufs = dbh; > do { > lock_buffer(sbh); > lock_buffer(dbh); > @@ -218,16 +220,16 @@ static void nilfs_copy_page(struct page *dst, struct page *src, int copy_dirty) > dbh = dbh->b_this_page; > } while (dbh != dbufs); > > - copy_highpage(dst, src); > + folio_copy(dst, src); > > - if (PageUptodate(src) && !PageUptodate(dst)) > - SetPageUptodate(dst); > - else if (!PageUptodate(src) && PageUptodate(dst)) > - ClearPageUptodate(dst); > - if (PageMappedToDisk(src) && !PageMappedToDisk(dst)) > - SetPageMappedToDisk(dst); > - else if (!PageMappedToDisk(src) && PageMappedToDisk(dst)) > - ClearPageMappedToDisk(dst); > + if (folio_test_uptodate(src) && !folio_test_uptodate(dst)) > + folio_mark_uptodate(dst); > + else if (!folio_test_uptodate(src) && folio_test_uptodate(dst)) > + folio_clear_uptodate(dst); > + if (folio_test_mappedtodisk(src) && !folio_test_mappedtodisk(dst)) > + folio_set_mappedtodisk(dst); > + else if (!folio_test_mappedtodisk(src) && folio_test_mappedtodisk(dst)) > + folio_clear_mappedtodisk(dst); > > do { > unlock_buffer(sbh); > @@ -269,7 +271,7 @@ int nilfs_copy_dirty_pages(struct address_space *dmap, > NILFS_PAGE_BUG(&folio->page, > "found empty page in dat page cache"); > > - nilfs_copy_page(&dfolio->page, &folio->page, 1); > + nilfs_copy_folio(dfolio, folio, true); > filemap_dirty_folio(folio_mapping(dfolio), dfolio); > > folio_unlock(dfolio); > @@ -314,7 +316,7 @@ void nilfs_copy_back_pages(struct address_space *dmap, > if (!IS_ERR(dfolio)) { > /* overwrite existing folio in the destination cache */ > WARN_ON(folio_test_dirty(dfolio)); > - nilfs_copy_page(&dfolio->page, &folio->page, 0); > + nilfs_copy_folio(dfolio, folio, false); > folio_unlock(dfolio); > folio_put(dfolio); > /* Do we not need to remove folio from smap here? */ > -- > 2.40.1 > Acked-by: Ryusuke Konishi <konishi.ryusuke@gmail.com> Everything else looks fine if the folio_copy symbol is exported. Thanks, Ryusuke Konishi
diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c index 1c075bd906c9..696215d899bf 100644 --- a/fs/nilfs2/page.c +++ b/fs/nilfs2/page.c @@ -184,30 +184,32 @@ void nilfs_page_bug(struct page *page) } /** - * nilfs_copy_page -- copy the page with buffers - * @dst: destination page - * @src: source page - * @copy_dirty: flag whether to copy dirty states on the page's buffer heads. + * nilfs_copy_folio -- copy the folio with buffers + * @dst: destination folio + * @src: source folio + * @copy_dirty: flag whether to copy dirty states on the folio's buffer heads. * - * This function is for both data pages and btnode pages. The dirty flag - * should be treated by caller. The page must not be under i/o. - * Both src and dst page must be locked + * This function is for both data folios and btnode folios. The dirty flag + * should be treated by caller. The folio must not be under i/o. + * Both src and dst folio must be locked */ -static void nilfs_copy_page(struct page *dst, struct page *src, int copy_dirty) +static void nilfs_copy_folio(struct folio *dst, struct folio *src, + bool copy_dirty) { struct buffer_head *dbh, *dbufs, *sbh; unsigned long mask = NILFS_BUFFER_INHERENT_BITS; - BUG_ON(PageWriteback(dst)); + BUG_ON(folio_test_writeback(dst)); - sbh = page_buffers(src); - if (!page_has_buffers(dst)) - create_empty_buffers(dst, sbh->b_size, 0); + sbh = folio_buffers(src); + dbh = folio_buffers(dst); + if (!dbh) + dbh = folio_create_empty_buffers(dst, sbh->b_size, 0); if (copy_dirty) mask |= BIT(BH_Dirty); - dbh = dbufs = page_buffers(dst); + dbufs = dbh; do { lock_buffer(sbh); lock_buffer(dbh); @@ -218,16 +220,16 @@ static void nilfs_copy_page(struct page *dst, struct page *src, int copy_dirty) dbh = dbh->b_this_page; } while (dbh != dbufs); - copy_highpage(dst, src); + folio_copy(dst, src); - if (PageUptodate(src) && !PageUptodate(dst)) - SetPageUptodate(dst); - else if (!PageUptodate(src) && PageUptodate(dst)) - ClearPageUptodate(dst); - if (PageMappedToDisk(src) && !PageMappedToDisk(dst)) - SetPageMappedToDisk(dst); - else if (!PageMappedToDisk(src) && PageMappedToDisk(dst)) - ClearPageMappedToDisk(dst); + if (folio_test_uptodate(src) && !folio_test_uptodate(dst)) + folio_mark_uptodate(dst); + else if (!folio_test_uptodate(src) && folio_test_uptodate(dst)) + folio_clear_uptodate(dst); + if (folio_test_mappedtodisk(src) && !folio_test_mappedtodisk(dst)) + folio_set_mappedtodisk(dst); + else if (!folio_test_mappedtodisk(src) && folio_test_mappedtodisk(dst)) + folio_clear_mappedtodisk(dst); do { unlock_buffer(sbh); @@ -269,7 +271,7 @@ int nilfs_copy_dirty_pages(struct address_space *dmap, NILFS_PAGE_BUG(&folio->page, "found empty page in dat page cache"); - nilfs_copy_page(&dfolio->page, &folio->page, 1); + nilfs_copy_folio(dfolio, folio, true); filemap_dirty_folio(folio_mapping(dfolio), dfolio); folio_unlock(dfolio); @@ -314,7 +316,7 @@ void nilfs_copy_back_pages(struct address_space *dmap, if (!IS_ERR(dfolio)) { /* overwrite existing folio in the destination cache */ WARN_ON(folio_test_dirty(dfolio)); - nilfs_copy_page(&dfolio->page, &folio->page, 0); + nilfs_copy_folio(dfolio, folio, false); folio_unlock(dfolio); folio_put(dfolio); /* Do we not need to remove folio from smap here? */
Both callers already have a folio, so pass it in and use it directly. Removes a lot of hidden calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> --- fs/nilfs2/page.c | 50 +++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 24 deletions(-)