From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E0800C77B73 for ; Thu, 20 Apr 2023 09:37:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234094AbjDTJhU (ORCPT ); Thu, 20 Apr 2023 05:37:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234406AbjDTJgm (ORCPT ); Thu, 20 Apr 2023 05:36:42 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EEC34C01; Thu, 20 Apr 2023 02:36:21 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0667F6097C; Thu, 20 Apr 2023 09:36:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BFCDCC433D2; Thu, 20 Apr 2023 09:36:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681983380; bh=9yTTALXrhDWYKygBa8EeTRuKSMceh1+79v9wec5T14o=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ajxHbB/KrslK5/nnLpLato1TyihZEAgQpvvMpxqib6MMAJ3Yh0E7l7lhumRbIfYgV oXwMWjuNvYi3l3Xkyfuf8L8S4JUIVNViCMVcpNnmEj5s54t/D+pGz03I/uuhwhlPbe w0mDDwdcRu9PL16grKZoxoQqtOjSZu9iIiP/wNlSX+coS66ffGa2WtflXvWArCz0Iq G2pU6aj7P8IxJjqJDEwnGhg80m2uOi+t3/bidJ2bUM9y5UVehpzn+rDuNmrwg69VoU nB9BmD/csjW3RNWG/2qn104xbqIJomwsN6X6X7tw340hytXXR8ygRQjv3AaD9lo6Tf +fBa0k43LhR9w== Date: Thu, 20 Apr 2023 11:36:15 +0200 From: Christian Brauner To: Mark Brown Cc: Gao Xiang , Gao Xiang , Jingbo Xu , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the erofs tree with the vfs-idmapping tree Message-ID: <20230420-umfragen-sandige-68c01f9ace00@brauner> References: <20230413144651.3519980-1-broonie@kernel.org> <4f9fdec2-cc2a-4bc7-9ddc-87809395f493@sirena.org.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <4f9fdec2-cc2a-4bc7-9ddc-87809395f493@sirena.org.uk> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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) {