Received-SPF: pass (google.com: domain of linux-kernel+bounces-17350-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Fri, 5 Jan 2024 11:10:16 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>, "Steven Rostedt (Google)"
 <rostedt@goodmis.org>
Subject: linux-next: manual merge of the vfs tree with Linus' tree
Message-ID: <20240105111016.5a3c36d0@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/hLOUkIKURAkrPlh9NLFO6P3";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

Today's linux-next merge of the vfs tree got a conflict in:

  fs/tracefs/inode.c

between commits:

  7e8358edf503 ("eventfs: Fix file and directory uid and gid ownership")
  ad579864637a ("tracefs: Check for dentry->d_inode exists in set_gid()")

from Linus' tree and commit:

  da549bdd15c2 ("dentry: switch the lists of children to hlist")

from the vfs tree.

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.

--=20
Cheers,
Stephen Rothwell

diff --cc fs/tracefs/inode.c
index bc86ffdb103b,61ca5fcf10f9..000000000000
--- a/fs/tracefs/inode.c
+++ b/fs/tracefs/inode.c
@@@ -207,28 -206,14 +206,25 @@@ static void set_gid(struct dentry *pare
 =20
  	change_gid(this_parent, gid);
  repeat:
- 	next =3D this_parent->d_subdirs.next;
+ 	dentry =3D d_first_child(this_parent);
  resume:
- 	while (next !=3D &this_parent->d_subdirs) {
+ 	hlist_for_each_entry_from(dentry, d_sib) {
 +		struct tracefs_inode *ti;
- 		struct list_head *tmp =3D next;
- 		struct dentry *dentry =3D list_entry(tmp, struct dentry, d_child);
- 		next =3D tmp->next;
 +
 +		/* Note, getdents() can add a cursor dentry with no inode */
 +		if (!dentry->d_inode)
 +			continue;
 +
  		spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED);
 =20
  		change_gid(dentry, gid);
 =20
 +		/* If this is the events directory, update that too */
 +		ti =3D get_tracefs(dentry->d_inode);
 +		if (ti && (ti->flags & TRACEFS_EVENT_INODE))
 +			eventfs_update_gid(dentry, gid);
 +
- 		if (!list_empty(&dentry->d_subdirs)) {
+ 		if (!hlist_empty(&dentry->d_children)) {
  			spin_unlock(&this_parent->d_lock);
  			spin_release(&dentry->d_lock.dep_map, _RET_IP_);
  			this_parent =3D dentry;

--Sig_/hLOUkIKURAkrPlh9NLFO6P3
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWXSOgACgkQAVBC80lX
0GxAvQgAjIHA5kp6W+popfdm1cZs9mOmIEWQsDuvlY/d3y7egnTLP5ORVMZHq+9s
Ebb9O5vwCTxZnAj9qSZShR+VlikK/DYQqJ3S/LXxwrnIRv7w9Gb/kpMCl82jG7tZ
XUxQn+rOdKAZTeM1Gl7rKlBo4xFJdoS8qLZ9P8NP8Y/8fwIVoRQtbn0Wje5+UNPW
zktv4P9ydiwY3XZhwHgYnITR9hyQIOOpoAEMlArtqA4Fvb4k49eDPkGPkAHAfNMK
UKER1a4e/4UkPLqCDirfbFndmlxRk/nxEzM2J5RgC9a8kK6OA7ZfCRS17K0jaXKo
HoOb3HuQDvIyBlxAbCWgUDgLnkfhkQ==
=qIof
-----END PGP SIGNATURE-----

--Sig_/hLOUkIKURAkrPlh9NLFO6P3--