From: Matthew Wilcox <willy@infradead•org>
To: Qu Wenruo <wqu@suse•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Christian Brauner <brauner@kernel•org>,
David Sterba <dsterba@suse•cz>, David Sterba <dsterba@suse•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the vfs_brauner tree with the btrfs tree
Date: Mon, 24 Nov 2025 00:07:31 +0000 [thread overview]
Message-ID: <aSOhw8mxgSlJ0xuv@casper.infradead.org> (raw)
In-Reply-To: <6a94eecb-a729-4b39-8cee-72521d12bd70@suse.com>
On Mon, Nov 24, 2025 at 09:55:23AM +1030, Qu Wenruo wrote:
>
>
> 在 2025/11/24 09:35, Stephen Rothwell 写道:
> > Hi all,
> >
> > After merging the vfs-brauner tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> >
> > In file included from include/linux/bits.h:30,
> > from include/linux/gfp_types.h:5,
> > from include/linux/gfp.h:5,
> > from include/linux/slab.h:16,
> > from fs/btrfs/ordered-data.c:6:
> > fs/btrfs/ordered-data.c: In function 'btrfs_mark_ordered_io_truncated':
> > fs/btrfs/ordered-data.c:561:37: error: implicit declaration of function 'folio_end'; did you mean 'folio_nid'? [-Wimplicit-function-declaration]
> > 561 | ASSERT(file_offset + len <= folio_end(folio));
> > | ^~~~~~~~~
> > include/linux/build_bug.h:30:63: note: in definition of macro 'BUILD_BUG_ON_INVALID'
> > 30 | #define BUILD_BUG_ON_INVALID(e) ((void)(sizeof((__force long)(e))))
> > | ^
> > fs/btrfs/ordered-data.c:561:9: note: in expansion of macro 'ASSERT'
> > 561 | ASSERT(file_offset + len <= folio_end(folio));
> > | ^~~~~~
> > In file included from include/linux/bits.h:30,
> > from include/linux/bitops.h:6,
> > from fs/btrfs/extent_io.c:3:
> > fs/btrfs/extent_io.c: In function 'submit_range':
> > fs/btrfs/extent_io.c:1621:31: error: implicit declaration of function 'folio_end'; did you mean 'folio_nid'? [-Wimplicit-function-declaration]
> > 1621 | ASSERT(start + len <= folio_end(folio));
> > | ^~~~~~~~~
> > include/linux/build_bug.h:30:63: note: in definition of macro 'BUILD_BUG_ON_INVALID'
> > 30 | #define BUILD_BUG_ON_INVALID(e) ((void)(sizeof((__force long)(e))))
> > | ^
> > fs/btrfs/extent_io.c:1621:9: note: in expansion of macro 'ASSERT'
> > 1621 | ASSERT(start + len <= folio_end(folio));
> > | ^~~~~~
> >
> > Caused by commit
> >
> > 48f3784b17d9 ("btrfs: Use folio_next_pos()")
> >
> > interatcing with commits
> >
> > 98dad9ca0426 ("btrfs: reduce extent map lookup during writes")
> > c7459b067d9d ("btrfs: make sure all ordered extents beyond EOF is properly truncated")
> >
> > from the btrfs tree.
> >
> > I applied the following merge fix patch.
>
> Thanks for fixing that.
>
> Although that two patches from btrfs tree is now retracted for other
> reasons.
>
> I'll refresh the involved patches in the next cycle when btrfs all migrate
> to folio_next_pos().
You don't need to wait for next cycle, you can merge vfs-6.19.folio
into the btrfs tree:
https://lore.kernel.org/linux-fsdevel/20251031-chaostheorie-lautlos-f2dee81d337b@brauner/
I think that would actually be a good idea; that way your testing
will show up any trouble with those commits. You should also merge in
https://lore.kernel.org/linux-fsdevel/20251123220518.1447261-1-willy@infradead.org/
which fixes a bug in that series (I'm expecting Christian will merge
that this week).
prev parent reply other threads:[~2025-11-24 0:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-23 23:05 linux-next: manual merge of the vfs_brauner tree with the btrfs tree Stephen Rothwell
2025-11-23 23:25 ` Qu Wenruo
2025-11-24 0:07 ` Matthew Wilcox [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aSOhw8mxgSlJ0xuv@casper.infradead.org \
--to=willy@infradead$(echo .)org \
--cc=brauner@kernel$(echo .)org \
--cc=dsterba@suse$(echo .)com \
--cc=dsterba@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=wqu@suse$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox