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:   Thu, 13 Apr 2023 16:49:27 +0100
From:   Mark Brown <broonie@kernel.org>
To:     Gao Xiang <xiang@kernel.org>
Cc:     Christian Brauner <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: Re: linux-next: manual merge of the erofs tree with the
 vfs-idmapping tree
Message-ID: <4f9fdec2-cc2a-4bc7-9ddc-87809395f493@sirena.org.uk>
References: <20230413144651.3519980-1-broonie@kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="n6RZDYGuxrYvmwhK"
Content-Disposition: inline
In-Reply-To: <20230413144651.3519980-1-broonie@kernel.org>
Precedence: bulk


--n6RZDYGuxrYvmwhK
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Apr 13, 2023 at 03:46:51PM +0100, broonie@kernel.org wrote:

> 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.

No, that's wrong.  This:

diff --cc fs/erofs/xattr.c
index 015462763bdd5,a04724c816e5f..0000000000000
--- 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) {

--n6RZDYGuxrYvmwhK
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmQ4JIYACgkQJNaLcl1U
h9DoVQf/a2i9JBz4jgO0Nm2RRd4s79fyZYmzvrz77Elka3NqN6dIKk6goMUfmjwN
XqSXmYdFVHuHWULh59ByAhpXh2TWkrkkprDYSj+hCjgFXiwOzpcZU3zrLq0Vm53E
QBIarbIE7M415G4ccCP8zvQSqVt2GmcvB58MAuhKvOM7W54wtIvYpu+IUw/u0Xvd
c/NvMOajnaadUJq7T++oSG1HY8CZ+WfObNwE5nmNBHTYLhdRMCcjxJLLuPMdkDyl
m1dAh776MzvEOUaiobrRikkOqScMTE8pXBmrWJ8wPdLOcBgClI8LCMiHil2cUbrr
zEQDr7x4FnKbZxXD8WXThFuSoaS/aA==
=sE9W
-----END PGP SIGNATURE-----

--n6RZDYGuxrYvmwhK--