On Mon, Mar 24, 2025 at 5:20 PM Linus Torvalds
<torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> On Sat, 22 Mar 2025 at 03:13, Christian Brauner <brauner@xxxxxxxxxx> wrote:
> >
> > Merge conflicts with mainline
> > =============================
> >
> > This contains a minor merge conflict for include/linux/fs.h.
>
> Hmm. My resolution here was to just take the plain VFS_WARN_ON_INODE()
> side, which basically drops commit 37d11cfc6360 ("vfs: sanity check
> the length passed to inode_set_cached_link()") entirely, because that
> one had a "TODO" that implies it's now replaced by the new
> VFS_WARN_ON_INODE() interface.
>
> This is just a note to make sure that if anybody was expecting
> something else, you can now speak up and say "can you please do X".
>
> Or, better yet, send a patch.
>
That TODO thing was a temporary fixup for the release and indeed it is
sorted out in this pull request.
If inode_set_cached_link() looks like this:
static inline void inode_set_cached_link(struct inode *inode, char
*link, int linklen)
{
VFS_WARN_ON_INODE(strlen(link) != linklen, inode);
VFS_WARN_ON_INODE(inode->i_opflags & IOP_CACHED_LINK, inode);
inode->i_link = link;
inode->i_linklen = linklen;
inode->i_opflags |= IOP_CACHED_LINK;
}
then you got the right version.
--
Mateusz Guzik <mjguzik gmail.com>
