Re: linux-next: manual merge of the vfs tree with the f2fs tree

From: Al Viro
Date: Tue Dec 19 2023 - 23:45:04 EST


On Wed, Dec 20, 2023 at 02:05:29PM +1100, Stephen Rothwell wrote:
> Hi Al,
>
> On Wed, 20 Dec 2023 01:34:02 +0000 Al Viro <viro@xxxxxxxxxxxxxxxxxx> wrote:
> >
> > My suggested resolution had been wrong, actually - the way it's written,
> > link count drop should be conditional on old_is_dir, cross-directory or
> > not.
> >
> > I think the right solution is
> > if (old_dir_entry)
> > f2fs_set_link(old_inode, old_dir_entry, old_dir_page, new_dir);
> > if (old_is_dir)
> > f2fs_i_links_write(old_dir, false);
>
> Ok, I will fix it up.

Backmerge with conflict resolution added to #for-next...