Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753215AbbLIVaj (ORCPT ); Wed, 9 Dec 2015 16:30:39 -0500 Received: from mail-lb0-f169.google.com ([209.85.217.169]:35446 "EHLO mail-lb0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753152AbbLIVag (ORCPT ); Wed, 9 Dec 2015 16:30:36 -0500 MIME-Version: 1.0 In-Reply-To: <20151209121916.1d4cdba4@canb.auug.org.au> References: <20151209121916.1d4cdba4@canb.auug.org.au> Date: Wed, 9 Dec 2015 16:30:34 -0500 Message-ID: Subject: Re: linux-next: build failure after merge of the vfs tree From: Mike Marshall To: Stephen Rothwell Cc: Al Viro , linux-next@vger.kernel.org, LKML , Andreas Gruenbacher Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4057 Lines: 101 Hi all... I'm having a chicken-and-egg moment here... I think "posix acls: Remove duplicate xattr name definitions" got into linux-next after Linus committed Linux 4.4-rc4. Unless I merge my for-next with Linus' tree at the current (arbitrary) point, I need to wait until I can merge with rc5 before I can apply this fix. I know Linus hates to get pull requests for stuff that's not based on a discrete tag, I'm not sure what's appropriate for linux-next... ? -Mike On Tue, Dec 8, 2015 at 8:19 PM, Stephen Rothwell wrote: > Hi Al, > > After merging the vfs tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > In file included from fs/orangefs/acl.c:8:0: > fs/orangefs/acl.c: In function 'pvfs2_get_acl': > fs/orangefs/pvfs2-kernel.h:203:38: error: 'POSIX_ACL_XATTR_ACCESS' undeclared (first use in this function) > #define PVFS2_XATTR_NAME_ACL_ACCESS POSIX_ACL_XATTR_ACCESS > ^ > fs/orangefs/acl.c:21:9: note: in expansion of macro 'PVFS2_XATTR_NAME_ACL_ACCESS' > key = PVFS2_XATTR_NAME_ACL_ACCESS; > ^ > fs/orangefs/pvfs2-kernel.h:203:38: note: each undeclared identifier is reported only once for each function it appears in > #define PVFS2_XATTR_NAME_ACL_ACCESS POSIX_ACL_XATTR_ACCESS > ^ > fs/orangefs/acl.c:21:9: note: in expansion of macro 'PVFS2_XATTR_NAME_ACL_ACCESS' > key = PVFS2_XATTR_NAME_ACL_ACCESS; > ^ > fs/orangefs/pvfs2-kernel.h:204:38: error: 'POSIX_ACL_XATTR_DEFAULT' undeclared (first use in this function) > #define PVFS2_XATTR_NAME_ACL_DEFAULT POSIX_ACL_XATTR_DEFAULT > ^ > fs/orangefs/acl.c:24:9: note: in expansion of macro 'PVFS2_XATTR_NAME_ACL_DEFAULT' > key = PVFS2_XATTR_NAME_ACL_DEFAULT; > ^ > fs/orangefs/acl.c: In function 'pvfs2_set_acl': > fs/orangefs/pvfs2-kernel.h:203:38: error: 'POSIX_ACL_XATTR_ACCESS' undeclared (first use in this function) > #define PVFS2_XATTR_NAME_ACL_ACCESS POSIX_ACL_XATTR_ACCESS > ^ > fs/orangefs/acl.c:77:10: note: in expansion of macro 'PVFS2_XATTR_NAME_ACL_ACCESS' > name = PVFS2_XATTR_NAME_ACL_ACCESS; > ^ > fs/orangefs/pvfs2-kernel.h:204:38: error: 'POSIX_ACL_XATTR_DEFAULT' undeclared (first use in this function) > #define PVFS2_XATTR_NAME_ACL_DEFAULT POSIX_ACL_XATTR_DEFAULT > ^ > fs/orangefs/acl.c:101:10: note: in expansion of macro 'PVFS2_XATTR_NAME_ACL_DEFAULT' > name = PVFS2_XATTR_NAME_ACL_DEFAULT; > ^ > > Caused by commit > > 97d79299223b ("posix acls: Remove duplicate xattr name definitions") > > interacting with the addition of orangefs in the orangefs tree. > > I applied this merge fix patch: > > From: Stephen Rothwell > Date: Wed, 9 Dec 2015 12:13:37 +1100 > Subject: [PATCH] orangefs: update for POSIX ACL name changes > > Signed-off-by: Stephen Rothwell > --- > fs/orangefs/pvfs2-kernel.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/orangefs/pvfs2-kernel.h b/fs/orangefs/pvfs2-kernel.h > index 4295e263e25b..9beeddbf8aa9 100644 > --- a/fs/orangefs/pvfs2-kernel.h > +++ b/fs/orangefs/pvfs2-kernel.h > @@ -200,8 +200,8 @@ struct client_debug_mask { > #endif > #endif > > -#define PVFS2_XATTR_NAME_ACL_ACCESS POSIX_ACL_XATTR_ACCESS > -#define PVFS2_XATTR_NAME_ACL_DEFAULT POSIX_ACL_XATTR_DEFAULT > +#define PVFS2_XATTR_NAME_ACL_ACCESS XATTR_NAME_POSIX_ACL_ACCESS > +#define PVFS2_XATTR_NAME_ACL_DEFAULT XATTR_NAME_POSIX_ACL_DEFAULT > #define PVFS2_XATTR_NAME_TRUSTED_PREFIX "trusted." > #define PVFS2_XATTR_NAME_DEFAULT_PREFIX "" > > -- > 2.6.2 > > -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/