Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 12 Apr 2023 10:19:42 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Gao Xiang <xiang@kernel.org>,
        Christian Brauner <christian@brauner.io>,
        Seth Forshee <sforshee@kernel.org>
Cc:     "Christian Brauner (Microsoft)" <brauner@kernel.org>,
        Gao Xiang <hsiangkao@linux.alibaba.com>,
        Jingbo Xu <jefflexu@linux.alibaba.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the erofs tree with the vfs-idmapping
 tree
Message-ID: <20230412101942.75e3efa9@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/.xtQAdYkhqRQfAhjDYL6Ugx";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

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

  fs/erofs/xattr.c

between commit:

  a5488f29835c ("fs: simplify ->listxattr() implementation")

from the vfs-idmapping tree and commit:

  3f43a25918ac ("erofs: handle long xattr name prefixes properly")

from the erofs 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/erofs/xattr.c
index 015462763bdd,a04724c816e5..000000000000
--- a/fs/erofs/xattr.c
+++ b/fs/erofs/xattr.c
@@@ -483,12 -517,28 +513,25 @@@ static int xattr_entrylist(struct xattr
  {
  	struct listxattr_iter *it =3D
  		container_of(_it, struct listxattr_iter, it);
- 	unsigned int prefix_len;
- 	const char *prefix;
+ 	unsigned int base_index =3D entry->e_name_index;
+ 	unsigned int prefix_len, infix_len =3D 0;
+ 	const char *prefix, *infix =3D NULL;
 -	const struct xattr_handler *h;
+=20
+ 	if (entry->e_name_index & EROFS_XATTR_LONG_PREFIX) {
+ 		struct erofs_sb_info *sbi =3D EROFS_SB(_it->sb);
+ 		struct erofs_xattr_prefix_item *pf =3D sbi->xattr_prefixes +
+ 			(entry->e_name_index & EROFS_XATTR_LONG_PREFIX_MASK);
+=20
+ 		if (pf >=3D sbi->xattr_prefixes + sbi->xattr_prefix_count)
+ 			return 1;
+ 		infix =3D pf->prefix->infix;
+ 		infix_len =3D pf->infix_len;
+ 		base_index =3D pf->prefix->base_index;
+ 	}
 =20
- 	prefix =3D erofs_xattr_prefix(entry->e_name_index, it->dentry);
 -	h =3D erofs_xattr_handler(base_index);
 -	if (!h || (h->list && !h->list(it->dentry)))
++	prefix =3D erofs_xattr_prefix(base_index, it->dentry);
 +	if (!prefix)
  		return 1;
 -
 -	prefix =3D xattr_prefix(h);
  	prefix_len =3D strlen(prefix);
 =20
  	if (!it->buffer) {

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmQ1+R4ACgkQAVBC80lX
0GybjAf/X+LntMu+EtDw+XNnc7gPqGLEhfuTkSh9+1GlHt/QrYeelSixY39DRaUG
2XcbC7TjT7lL+pj5M4UDGLID7y/gR+tnfxd86H6JOOZ3IxIFWauNi1zWWCtY1IuP
Ckk/Ft0/jhDiPKhaKduWTqJUzyjx7Xd3yhlA0lkgMXaAjKTyy4nws/oGnrKdsolT
qAfkYbJb35mWdoMFfUGQio5GeBQ3d10E09MSBX/4h7/JL6hV2MsB+5wHi2VGSx4y
/k47ysnZ0QXUgSziGXT9V3JHOLqfoxKdz0gfo6bK7T6A6KSr8Dc6ouMkY1O6xgzP
9j3UPmfgNTETk1fH4NFpYe9M3qNiqA==
=JwzJ
-----END PGP SIGNATURE-----

--Sig_/.xtQAdYkhqRQfAhjDYL6Ugx--