From: Christian Brauner <brauner@kernel.org>
To: Mark Brown <broonie@kernel.org>
Cc: Gao Xiang <xiang@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
Date: Thu, 20 Apr 2023 11:36:15 +0200 [thread overview]
Message-ID: <20230420-umfragen-sandige-68c01f9ace00@brauner> (raw)
In-Reply-To: <4f9fdec2-cc2a-4bc7-9ddc-87809395f493@sirena.org.uk>
On Thu, Apr 13, 2023 at 04:49:27PM +0100, Mark Brown wrote:
> 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:
Yes, that fixup looks correct, thank you!
>
> 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 =
> container_of(_it, struct listxattr_iter, it);
> - unsigned int prefix_len;
> - const char *prefix;
> + unsigned int base_index = entry->e_name_index;
> + unsigned int prefix_len, infix_len = 0;
> + const char *prefix, *infix = NULL;
> - const struct xattr_handler *h;
> +
> + if (entry->e_name_index & EROFS_XATTR_LONG_PREFIX) {
> + struct erofs_sb_info *sbi = EROFS_SB(_it->sb);
> + struct erofs_xattr_prefix_item *pf = sbi->xattr_prefixes +
> + (entry->e_name_index & EROFS_XATTR_LONG_PREFIX_MASK);
> +
> + if (pf >= sbi->xattr_prefixes + sbi->xattr_prefix_count)
> + return 1;
> + infix = pf->prefix->infix;
> + infix_len = pf->infix_len;
> + base_index = pf->prefix->base_index;
> + }
>
> - prefix = erofs_xattr_prefix(entry->e_name_index, it->dentry);
> - h = erofs_xattr_handler(base_index);
> - if (!h || (h->list && !h->list(it->dentry)))
> ++ prefix = erofs_xattr_prefix(base_index, it->dentry);
> + if (!prefix)
> return 1;
> -
> - prefix = xattr_prefix(h);
> prefix_len = strlen(prefix);
>
> if (!it->buffer) {
next prev parent reply other threads:[~2023-04-20 9:37 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-13 14:46 linux-next: manual merge of the erofs tree with the vfs-idmapping tree broonie
2023-04-13 15:49 ` Mark Brown
2023-04-13 16:16 ` Gao Xiang
2023-04-13 16:23 ` Mark Brown
2023-04-13 16:27 ` Gao Xiang
2023-04-20 9:36 ` Christian Brauner [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-04-12 0:19 Stephen Rothwell
2023-04-12 2:01 ` Gao Xiang
2023-04-12 2:35 ` Jingbo Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230420-umfragen-sandige-68c01f9ace00@brauner \
--to=brauner@kernel.org \
--cc=broonie@kernel.org \
--cc=hsiangkao@linux.alibaba.com \
--cc=jefflexu@linux.alibaba.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=xiang@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).