Received-SPF: pass (google.com: domain of linux-kernel+bounces-6132-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 11:13:25 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>, Jaegeuk Kim <jaegeuk@kernel.org>
Cc: 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: <20231220111325.5dd55e47@canb.auug.org.au>
In-Reply-To: <20231220104734.0979a9f8@canb.auug.org.au>
References: <20231220104734.0979a9f8@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/za_oBUSqBa1NS65BZ31N7+h";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/za_oBUSqBa1NS65BZ31N7+h
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Al,

On Wed, 20 Dec 2023 10:47:34 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the vfs tree got a conflict in:
>=20
>   fs/f2fs/namei.c
>=20
> between commit:
>=20
>   53edb549565f ("f2fs: fix to avoid dirent corruption")
>=20
> from the f2fs tree and commit:
>=20
>   7deee77b993a ("f2fs: Avoid reading renamed directory if parent does not=
 change")
>=20
> from the vfs tree.
>=20
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Then I remembered to look at your suggested resolution and redid it
like you did (see below).
--=20
Cheers,
Stephen Rothwell

--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@@ -1104,12 -1106,12 +1105,9 @@@ static int f2fs_rename(struct mnt_idma
  		iput(whiteout);
  	}
 =20
 -	if (old_is_dir) {
 -		if (old_dir_entry && !whiteout)
 -			f2fs_set_link(old_inode, old_dir_entry,
 +	if (old_dir_entry) {
- 		if (old_dir !=3D new_dir)
- 			f2fs_set_link(old_inode, old_dir_entry,
++		f2fs_set_link(old_inode, old_dir_entry,
  						old_dir_page, new_dir);
--		else
--			f2fs_put_page(old_dir_page, 0);
  		f2fs_i_links_write(old_dir, false);
  	}
  	if (F2FS_OPTION(sbi).fsync_mode =3D=3D FSYNC_MODE_STRICT) {

--Sig_/za_oBUSqBa1NS65BZ31N7+h
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWCMaUACgkQAVBC80lX
0GxkUQf/dro/dS32sGdL1hEyx/nQs9iXfBANu2fWDrvBoPiEsnWKSAb5jyjHkg3o
PWxyCM+umwm5PlM/bXqGYcdcpBeaVH38ioE8zY7LfJW/wvHiR9LLPwHY7rnARU0E
pvBvBBDtxZpqqnr2wLEad42ycOmXNFCjqboZCoA4FrQU7aE8Vhr9fQV5jdiz7hPU
sSybwakljN+k/5MvAC6z9O4xGFlKunCymFeA2sCLTrjuamKF17Sfk/jXMX6d7wfM
IzU2Rw5XA+ZLRsnlRwXczPuWm4brlBp/Kzfq8G2EuIjhgzPOfOcrcQQP48YygD/X
Qdhav14q6MQmn+0sgK0mOJYp7H5eSw==
=Brhi
-----END PGP SIGNATURE-----

--Sig_/za_oBUSqBa1NS65BZ31N7+h--