Received-SPF: pass (google.com: domain of linux-kernel+bounces-6374-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Wed, 20 Dec 2023 04:44:42 +0000
From: Al Viro <viro@zeniv.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>, Chao Yu <chao@kernel.org>,
	Jan Kara <jack@suse.cz>,
	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 tree with the f2fs tree
Message-ID: <20231220044442.GX1674809@ZenIV>
References: <20231220104734.0979a9f8@canb.auug.org.au>
 <20231220111325.5dd55e47@canb.auug.org.au>
 <20231220013402.GW1674809@ZenIV>
 <20231220140529.3979085c@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20231220140529.3979085c@canb.auug.org.au>
Sender: Al Viro <viro@ftp.linux.org.uk>

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@zeniv.linux.org.uk> 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...